Merge "Rename RC file extensions to match master branch" into amsterdam