Merge pull request #745 from jmaas/release24

Fix RPM packaging on EL5