Merge pull request #4222 from edx/youngstrom/rollback_ec2

jenkins common: roll back to ec2 1.36

playbooks/roles/jenkins_build/defaults/main.yml

@@ -122,7 +122,7 @@ build_jenkins_plugins_list:
     version: '1.13'
     group: 'org.jenkins-ci.plugins'
   - name: 'ec2'
-    version: '1.37'
+    version: '1.36'
     group: 'org.jenkins-ci.plugins'
   - name: 'envinject'
     version: '2.0'

playbooks/roles/jenkins_common/templates/config/ec2_config.yml.j2

@@ -27,7 +27,6 @@ CLOUDS:
             NUM_EXECUTORS: '{{ ami.NUM_EXECUTORS }}'
             REMOTE_ADMIN: '{{ ami.REMOTE_ADMIN }}'
             ROOT_COMMAND_PREFIX: '{{ ami.ROOT_COMMAND_PREFIX }}'
-            SLAVE_COMMAND_PREFIX: '{{ ami.SLAVE_COMMAND_PREFIX }}'
             JVM_OPTIONS: '{{ ami.JVM_OPTIONS }}'
             STOP_ON_TERMINATE: {{ ami.STOP_ON_TERMINATE }}
             SUBNET_ID: '{{ ami.SUBNET_ID }}'