Merge "Properly set RMR test args for sonar job"