#4509 fixed temp files, waiting for index and ignoring move to same path
Merge branch 'master-2.5' of github.com:dotCMS/dotCMS into master-2.5