Merge "Rename should behave like create: avoid conflict." into nyc-mr1-dev