create non-existant /etc/openshift/ dir and gen htpasswd file

This PR addresses /etc/openshift/htpasswd creation that fails if a person is using broker_auth_plugin=> 'htpasswd'.  What actually happens is that by running 'puppet apply --verbose (file.pp) a second time the directory will be created because broker.pp also creates the directory also.  For AIO installs, creating the /etc/openshift directory, and invoking the -bc flags for htpasswd we can create the non-existent file.
Update htpasswd.pp
Update htpasswd.pp
Merge pull request #118 from mikeSGman/master

Correction to PR#117
Merge pull request #120 from kraman/bugfix

Add ENV_OPENSHIFT_UMASK so that snapshot/restore works on Origin.