Fix up spec build

Apparently no one regularly runs/tests the builds/redhat spec build; new files get added but not packaged, old files don't get removed, etc. 

The primary purpose here is to move the two commits originally part of the 4.0.x branch, but there are five more for subsequent problems not present in 4.0.x.