Merge pull request #2725 from apache/merge-rename

Renamed steps around "merge" for better consistency.