Merge "Rework the way Java version is set in CSIT jobs"

diff --combined jjb/unimgr/unimgr-csit-basic.yaml
index e22191d5fd063427d7f850cadaf6209cfdd974b9,5b9377caf8f72163f3a1fe927fa48a83a12a6fd1..d6117c035f03f517ae2fbffa38a4482e3a3b5196
--- 1/jjb/unimgr/unimgr-csit-basic.yaml
--- 2/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@@ -14,10 -14,10 +14,10 @@@
      stream:
          - boron:
              branch: 'master'
-             jdk: 'openjdk8'
+             jre: 'openjdk8'
          - beryllium:
              branch: 'stable/beryllium'
-             jdk: 'openjdk7'
+             jre: 'openjdk7'
  
      install:
          - only:
@@@ -25,11 -25,8 +25,11 @@@
          - all:
              scope: 'all'
  
 +    # Mininet configuration
 +    mininet-vms: 2
 +
      # Features to install
 -    install-features: 'odl-unimgr'
 +    install-features: 'odl-unimgr-ui'
  
      # Robot custom options
      robot-options: ''