Merge "Fix Usage of rdo-release rpm"