update for solaris and em 12.1.0.4 install
Merge branch 'master' of github.com:biemond/puppet