More work for ENTESB-1996: Support users configuring the http security

Default httpd.conf contains comments on how to enable security.
Fixes: ENTESB-1994 Enhance build process so that each build is a release build
Merge branch 'mvnrepo' into openshift-enterprise-fuse-builder-rpm-6.1

* mvnrepo:
  Fixes: ENTESB-1994 Enhance build process so that each build is a release build
  More work for ENTESB-1996: Support users configuring the http security

Conflicts:
	bin/control