Merge branch 'develop' of https://github.com/xsurfer/openshift-origin-cartridge-jbossas-7-cloudtm into develop
Merge branch 'develop' of https://github.com/xsurfer/openshift-origin-cartridge-jbossas-7-cloudtm into develop