Port over script improvements from other maven module
Port over script improvements from other maven module

Signed-off-by: Jonathan Dowland <c0ba515c40872faa4125f492781ab4f735e85bcc@redhat.com>

spolti/cct_module,jboss-openshift/cct_module,jboss-openshift/cct_module,jboss-openshift/cct_module,spolti/cct_module,spolti/cct_module