CP-9798: Update for parsing newer RPM's output