Incorporating the relevant recent jbossas cartridge changes (starting from commit https://github.com/openshift/origin-server/commit/ff25ac5fe73a526bc94b7420ce7c4ed40fdaa2d3 up until https://github.com/openshift/origin-server/commit/0a932b9feae96ae46e4cfe1c5346f486919fddfe).