coding standard cleanup, fix warning
fix warnings in overlays
added support for rolling version numbers in backups
Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements
revert debugging change
Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements

Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	libraries/octree/src/OctreePersistThread.cpp
	libraries/octree/src/OctreePersistThread.h
Merge pull request #3808 from ZappoMan/persistThreadImprovements

Persist File Backup Improvements