Open Infinity 3.1.0 puppet script fixes
Merge branch 'master' of https://github.com/open-infinity/cmt