Merge from previous changes
Merge branch 'master' of github.com:ausnimbus/puppet-openshift_origin