[ENTESB-2038] Add password ENV variable for containers created from hawtio. Fix "tidy" function
Fixes https://issues.jboss.org/browse/ENTESB-2033
Merge branch 'openshift-enterprise-fuse-rpm-6.1' into openshift-enterprise-amq-rpm-6.1

* openshift-enterprise-fuse-rpm-6.1:
  Fixes https://issues.jboss.org/browse/ENTESB-2033
  [ENTESB-2038] Add password ENV variable for containers created from hawtio. Fix "tidy" function

Conflicts:
	metadata/manifest.yml