PT-35875181 - fix few bugs with rpm deps building across distros