Merge branch 'thilakrajs-puppet_cleanup_ha' into puppet_cleanup