cherrypick https://github.com/jbosstools/jbosstools-build-ci/pull/96 and fix spacing/indent errors, too (thanks Snjezana\!) >> master