Merge branch 'stable-3.6'

* stable-3.6:
  RenameEmail: Preserve files which are not updated

Change-Id: I257bfaafc0623f2d0319fbd39d0520aa84a2a0b4