Merge "Adjust rmr-python jobs for revised PyPI templates"