am 20f07e33: Merge "Unlink an old file before moving the new file over it" into jb-mr1-dev

* commit '20f07e335df4155df2176e6124389a98e25aecf7':
  Unlink an old file before moving the new file over it