Merge "Apex: Updates CI to use new rpm names"