Merge "Remove devstack mitaka images"

diff --combined jjb/releng-jobs.yaml
index 2f309173fb5edde835affdbc92d719e9a5afc2a2,a327ce81e0550040230aaab6f2da25a0c11bd359..f45a61a8be9389c5b63eea48f7460e60be162363
--- 1/jjb/releng-jobs.yaml
--- 2/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@@ -21,7 -21,6 +21,6 @@@
  
      templates:
        - devstack
-       - devstack-pre-pip-mitaka
        - devstack-pre-pip-newton
        - docker
        - gbp
@@@ -41,8 -40,6 +40,6 @@@
          templates: java-builder
        - platforms: ubuntu-14.04
          templates: robot
-       - platforms: ubuntu-14.04
-         templates: devstack-pre-pip-mitaka
        - platforms: ubuntu-14.04
          templates: devstack-pre-pip-newton
        - platforms: ubuntu-14.04
@@@ -55,8 -52,6 +52,6 @@@
          templates: java-builder
        - platforms: ubuntu-16.04
          templates: robot
-       - platforms: ubuntu-16.04
-         templates: devstack-pre-pip-mitaka
        - platforms: ubuntu-16.04
          templates: devstack-pre-pip-newton
        - platforms: ubuntu-16.04
@@@ -386,7 -381,7 +381,7 @@@
  
      triggers:
        - reverse:
 -          jobs: 'builder-merge'
 +          jobs: 'builder-jjb-merge'
  
      builders:
        - shell: |