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

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