Minor changes to fix RPM builds
Merge branch '4.3'