Merge branch 'fix-refused-build-cli-npe' of github.com:marco-miller/jenkins into marco-miller-fix-refused-build-cli-npe