Fix compilation failures on RHEL when manage_package => true
#431
+174
−152
manage_package => true
#431