Merge "Update CentOS7 devstack images"

diff --cc jjb/releng-defaults.yaml
index 8ca16ad2e326f6704588492698c52789ddf6e6af,60de3c503eb5f758ab137914c5fde42edd8afe75..b366575ce0b406768e95077709663bd269a9a0a1
--- 1/jjb/releng-defaults.yaml
--- 2/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@@ -61,10 -61,10 +61,10 @@@
      docker_system_image: CentOS 7 - docker - 20170120-1434
      odl_system_count: 1
      odl_system_flavor: 4 GB General Purpose v1
 -    odl_system_image: CentOS 7 - java-builder - 20170607-1706
 +    odl_system_image: CentOS 7 - java-builder - 20170609-0259
      openstack_system_count: 1
      openstack_system_flavor: 8 GB General Purpose v1
-     openstack_system_image: CentOS 7 - devstack - 20170221-1719
+     openstack_system_image: CentOS 7 - devstack - 20170609-0220
      tools_system_count: 1
      tools_system_flavor: 2 GB General Purpose v1
      tools_system_image: Ubuntu 14.04 - mininet - 20170210-0439