Merge "Only use -all- job if it exists"

diff --cc jjb/bgpcep/bgpcep-csit-throughpcep.yaml
Simple merge

diff --cc jjb/bier/bier-csit-basic.yaml
index e47ff6afce623662c57551332eac770897e3ca7e,33b798cad754df2e5428bb7ee97b0f93467da10b..977c28084d19cc17516ca77b6839869b636f170a
--- 1/jjb/bier/bier-csit-basic.yaml
--- 2/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@@ -28,14 -24,13 +28,12 @@@
            jre: 'openjdk8'
            karaf-version: karaf3
  
 -    # TODO: Delete the following if suites are compatible with Boron again.
 -    verify-stream: 'carbon'
 -    # TODO: Remove the lines above and below when carbon becomes the default scit-verify stream.
 -    verify-branch: 'stable/carbon'
 -    # TODO: Update the line above when stable/carbon is created.
 +    # TODO: Delete the following if suites are compatible with Nitrogen again.
 +    verify-stream: 'nitrogen'
 +    # TODO: Remove the lines above and below when nitrogen becomes the default csit-verify stream.
 +    verify-branch: 'master'
  
      install:
-       - only:
-           scope: 'only'
        - all:
            scope: 'all'
  

diff --cc jjb/genius/genius-csit-genius.yaml
Simple merge

diff --cc jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
Simple merge

diff --cc jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
Simple merge

diff --cc jjb/netconf/netconf-userfeatures.yaml
Simple merge

diff --cc jjb/sxp/sxp-csit-cluster-routing.yaml
index ea209ced02c2ca3045af7ea1fe2df293e8f331ac,642099b4c635524dcb87628940b1cb18da6cde2b..9f999fc8ee08cd4b7211e2267047298c33008d5e
--- 1/jjb/sxp/sxp-csit-cluster-routing.yaml
--- 2/jjb/sxp/sxp-csit-cluster-routing.yaml
+++ b/jjb/sxp/sxp-csit-cluster-routing.yaml
@@@ -22,11 -22,8 +22,9 @@@
            branch: 'stable/carbon'
            jre: 'openjdk8'
            karaf-version: karaf3
 +          install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-route'
  
      install:
-       - only:
-           scope: 'only'
        - all:
            scope: 'all'