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