Merge "Update RPM tests to Oxygen SR4"