Synch with conf files from origin-server/master#177

Miciah wants to merge 1 commit into

openshift:masteropenshift/puppet-openshift_origin:masterfrom

Miciah:master-synch-with-conf-files-from-origin-server-masterMiciah/puppet-openshift_origin:master-synch-with-conf-files-from-origin-server-masterCopy head branch name to clipboard