Summary of changes: 3742ff4... import from review #1098625 (*) 02d27b1... cleanup EL5 stuff (*) 6c89f43... cleanup EL6 stuff (*) (*) This commit already existed in another branch; no separate mail sent