Branch name changed.
Some more amq tweaks.
Merge branch 'openshift-enterprise-fuse-rpm-6.1' into openshift-enterprise-amq-rpm-6.1

* openshift-enterprise-fuse-rpm-6.1:
  Some more amq tweaks.
  Branch name changed.

Conflicts:
	openshift-origin-cartridge.spec