[PATCH conductor 20/22] Fix RPM building after provider selection support added