MAESTRO-2626 Make vagrant keep latest puppet happy. Old version was happy with either case, new requires upper
Keep yum cahce in host if MAESTRO_CACHE is set. Needs to be enabled in yum.conf
Merge branch 'master' into development