Merge "Let NEXUSPROXY override NEXUS_URL if both are set"

diff --cc .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-ciman-packer-verify
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-maven-maven-clm-master
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-maven-maven-release-master
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-maven-sonar
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-rtd-rtd-verify-master
Simple merge

diff --cc .jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
Simple merge

diff --cc .jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
Simple merge

diff --cc .jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
Simple merge

diff --cc .jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
Simple merge

diff --cc .jjb-test/expected-xml/github-ciman-packer-verify
Simple merge

diff --cc .jjb-test/expected-xml/github-maven-maven-clm-master
Simple merge

diff --cc .jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
Simple merge

diff --cc .jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
Simple merge

diff --cc .jjb-test/expected-xml/github-maven-maven-release-master
Simple merge

diff --cc .jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8
Simple merge

diff --cc .jjb-test/expected-xml/github-maven-sonar
Simple merge