Fix for ENTESB-1921: mq-amq profile fails 'Could not resolve placeholder 'keystore.url' in string value "${keystore.url}"
Merge branch 'openshift-enterprise-fuse-rpm-6.1' into openshift-enterprise-amq-rpm-6.1

* openshift-enterprise-fuse-rpm-6.1:
  Fix for ENTESB-1921: mq-amq profile fails 'Could not resolve placeholder 'keystore.url' in string value "${keystore.url}"