Merge "Add redhat-rpm-config to rpm build deps" into feature/zuulv3