Hey Martin, can you backport the changes you made from here: https://bugzilla.redhat.com/show_bug.cgi?id=1328828 for this BZ? We think this is a duplicate issue of that BZ, we just need a backport to 5.5.z.
*** This bug has been marked as a duplicate of bug 1350968 ***