Merge branch 'add-openshift-origin-cartridge-dependencies' of github.com:andrewklau/puppet-openshift_origin into add-openshift-origin-cartridge-dependencies

Conflicts:
	manifests/init.pp