Apply Omnibus 4.0 changes for RPM packaging