Merge changes I7d7323b8,Ib796cfee

* changes:
  Add default refspec reference
  Refactor packer ci templates

diff --cc jjb-test/expected-xml/gerrit-ciman-jjb-merge
index 9f8081e,93149c9..12b0e87
--- 1/jjb-test/expected-xml/gerrit-ciman-jjb-merge
--- 2/jjb-test/expected-xml/gerrit-ciman-jjb-merge
+++ b/jjb-test/expected-xml/gerrit-ciman-jjb-merge
@@@ -62,17 -62,8 +62,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>JJB_VERSION</name>
            <description>Jenkins Job Builder version to download and install.</description>

diff --cc jjb-test/expected-xml/gerrit-ciman-jjb-verify
index d5580b3,61e2a61..69c3166
--- 1/jjb-test/expected-xml/gerrit-ciman-jjb-verify
--- 2/jjb-test/expected-xml/gerrit-ciman-jjb-verify
+++ b/jjb-test/expected-xml/gerrit-ciman-jjb-verify
@@@ -62,17 -62,8 +62,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>JJB_VERSION</name>
            <description>Jenkins Job Builder version to download and install.</description>

diff --cc jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
index 87b5ec9,4fde590..0565e3c
--- 1/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
--- 2/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
+++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
@@@ -62,17 -62,8 +62,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>

diff --cc jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
index 1a7fde3,771c62e..1bcd155
--- 1/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
--- 2/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
+++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
@@@ -62,17 -62,8 +62,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>

diff --cc jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
index 0a54424,1713560..7cf25b5
--- 1/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
--- 2/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
+++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
@@@ -62,17 -62,8 +62,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>

diff --cc jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
index 62c6857,62be790..73c50d5
--- 1/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
--- 2/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
+++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
@@@ -62,17 -62,8 +62,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>

diff --cc jjb-test/expected-xml/gerrit-ciman-packer-verify
index 5c963ff,51f67c0..04a3f52
--- 1/jjb-test/expected-xml/gerrit-ciman-packer-verify
--- 2/jjb-test/expected-xml/gerrit-ciman-packer-verify
+++ b/jjb-test/expected-xml/gerrit-ciman-packer-verify
@@@ -62,17 -62,8 +62,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>

diff --cc jjb-test/expected-xml/gerrit-maven-maven-clm-master
index 8d5c7a3,6786db9..150a594
--- 1/jjb-test/expected-xml/gerrit-maven-maven-clm-master
--- 2/jjb-test/expected-xml/gerrit-maven-maven-clm-master
+++ b/jjb-test/expected-xml/gerrit-maven-maven-clm-master
@@@ -63,17 -63,8 +63,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m

diff --cc jjb-test/expected-xml/gerrit-maven-maven-release-master
index b391637,dd9ddc3..dd4d3e8
--- 1/jjb-test/expected-xml/gerrit-maven-maven-release-master
--- 2/jjb-test/expected-xml/gerrit-maven-maven-release-master
+++ b/jjb-test/expected-xml/gerrit-maven-maven-release-master
@@@ -63,17 -63,8 +63,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m

diff --cc jjb-test/expected-xml/gerrit-python-tox-verify-master
index 6908475,30fa7f1..885d5a2
--- 1/jjb-test/expected-xml/gerrit-python-tox-verify-master
--- 2/jjb-test/expected-xml/gerrit-python-tox-verify-master
+++ b/jjb-test/expected-xml/gerrit-python-tox-verify-master
@@@ -62,17 -62,8 +62,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>TOX_DIR</name>
            <description>Path to directory containing tox.ini file.

diff --cc jjb-test/expected-xml/github-ciman-jjb-merge
index ad689da,ab6cdb5..12a5555
--- 1/jjb-test/expected-xml/github-ciman-jjb-merge
--- 2/jjb-test/expected-xml/github-ciman-jjb-merge
+++ b/jjb-test/expected-xml/github-ciman-jjb-merge
@@@ -57,17 -57,8 +57,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>JJB_VERSION</name>
            <description>Jenkins Job Builder version to download and install.</description>

diff --cc jjb-test/expected-xml/github-ciman-jjb-verify
index 83cd7fd,1f0e9d5..0d8d5b2
--- 1/jjb-test/expected-xml/github-ciman-jjb-verify
--- 2/jjb-test/expected-xml/github-ciman-jjb-verify
+++ b/jjb-test/expected-xml/github-ciman-jjb-verify
@@@ -57,17 -57,8 +57,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>JJB_VERSION</name>
            <description>Jenkins Job Builder version to download and install.</description>

diff --cc jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
index 1f75c0c,36755e6..38be921
--- 1/jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
--- 2/jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
+++ b/jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
@@@ -57,17 -57,8 +57,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>

diff --cc jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
index bee3db0,44c9896..9fb389f
--- 1/jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
--- 2/jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
+++ b/jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
@@@ -57,17 -57,8 +57,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>

diff --cc jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
index b3ca61c,c8ff442..d7df795
--- 1/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
--- 2/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
+++ b/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
@@@ -57,17 -57,8 +57,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>

diff --cc jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
index 8bc173b,a48988a..fe4bb8a
--- 1/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
--- 2/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
+++ b/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
@@@ -57,17 -57,8 +57,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>

diff --cc jjb-test/expected-xml/github-ciman-packer-verify
index 20da5d3,5386b73..6e84f2b
--- 1/jjb-test/expected-xml/github-ciman-packer-verify
--- 2/jjb-test/expected-xml/github-ciman-packer-verify
+++ b/jjb-test/expected-xml/github-ciman-packer-verify
@@@ -57,17 -57,8 +57,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>

diff --cc jjb-test/expected-xml/github-maven-maven-clm-master
index cfe3359,414d3d4..8a9a67f
--- 1/jjb-test/expected-xml/github-maven-maven-clm-master
--- 2/jjb-test/expected-xml/github-maven-maven-clm-master
+++ b/jjb-test/expected-xml/github-maven-maven-clm-master
@@@ -58,17 -58,8 +58,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m

diff --cc jjb-test/expected-xml/github-maven-maven-release-master
index 9186d87,9a415e2..73aba06
--- 1/jjb-test/expected-xml/github-maven-maven-release-master
--- 2/jjb-test/expected-xml/github-maven-maven-release-master
+++ b/jjb-test/expected-xml/github-maven-maven-release-master
@@@ -58,17 -58,8 +58,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m

diff --cc jjb-test/expected-xml/github-python-tox-verify-master
index 2d499f8,7a8a99b..31b825e
--- 1/jjb-test/expected-xml/github-python-tox-verify-master
--- 2/jjb-test/expected-xml/github-python-tox-verify-master
+++ b/jjb-test/expected-xml/github-python-tox-verify-master
@@@ -57,17 -57,8 +57,17 @@@ job is triggered by Gerrit
  Note that Gerrit will override this parameter automatically if a
  job is triggered by Gerrit.
  </description>
-           <defaultValue/>
+           <defaultValue>refs/heads/master</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>LFTOOLS_VERSION</name>
 +          <description>Version of lftools to install. Can be a specific version like
 +'0.6.0' or a PEP-440 definition.
 +https://www.python.org/dev/peps/pep-0440/
 +For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
 +</description>
 +          <defaultValue>&lt;1.0.0</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>TOX_DIR</name>
            <description>Path to directory containing tox.ini file.

diff --cc jjb/lf-ci-jobs.yaml
Simple merge

diff --cc jjb/lf-macros.yaml
Simple merge