SERVER-9123 fixups to make rpms work