This patch was created in response to c464b9a2a63c4ff41468b2e20ac48db806c918d6 in odlparent. That patch caused other failures so it was reverted and now this patch is reverted til the issues are fixed.
Change-Id: I7025b96a2fd43eec50ca4f0d405e4ceedf88bdf4 Signed-off-by: Sam Hague <shague@redhat.com>