am 39758edb: am 386ce58a: Merge "Don\'t backup or delete the backup file, if...

am 39758edb: am 386ce58a: Merge "Don\'t backup or delete the backup file, if it\'s in the backup path." into jb-dev

* commit '39758edb':
  Don't backup or delete the backup file, if it's in the backup path.