Merging recent jbossas cartridge changes (starting from commit https://github.com/openshift/origin-server/commit/d9779f49d9caf0df433ed47a95486dd4bf97d3c9 up until https://github.com/openshift/origin-server/commit/c2e53f5b5d7cc99b8d1ea89c1ab9581aee9b94dc).