diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py
index 752dbff5a6..766db6718e 100644
--- a/awx/main/models/unified_jobs.py
+++ b/awx/main/models/unified_jobs.py
@@ -754,8 +754,8 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
                     name=self.name,
                     url=self.get_ui_url(),
                     created_by=smart_text(self.created_by),
-                    started=self.started.isoformat(),
-                    finished=self.finished.isoformat(),
+                    started=self.started.isoformat() if self.started is not None else None,
+                    finished=self.finished.isoformat() if self.finished is not None else None,
                     status=self.status,
                     traceback=self.result_traceback)
 
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 603bd21d19..a4110e8286 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -540,6 +540,7 @@ EC2_REGION_NAMES = {
     'ap-southeast-1': 'Asia Pacific (Singapore)',
     'ap-southeast-2': 'Asia Pacific (Sydney)',
     'ap-northeast-1': 'Asia Pacific (Tokyo)',
+    'ap-northeast-2': 'Asia Pacific (Seoul)',
     'sa-east-1': 'South America (Sao Paulo)',
     'us-gov-west-1': 'US West (GovCloud)',
     'cn-north-1': 'China (Beijing)',
diff --git a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
index 90642e7f36..5c64299c70 100644
--- a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
+++ b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
@@ -31,7 +31,8 @@ export default
                         scope.notification_type_options.forEach(function(type) {
                             if (type.value === notification_template.notification_type) {
                                 scope.notification_templates[i].notification_type = type.label;
-                                scope.notification_templates[i].status = notification_template.summary_fields.recent_notifications[0].status;
+                                var recent_notifications = notification_template.summary_fields.recent_notifications;
+                                scope.notification_templates[i].status = recent_notifications && recent_notifications.length > 0 ? recent_notifications[0].status : "none";
                             }
                         });
                     });
diff --git a/awx/ui/client/src/notifications/shared/type-change.service.js b/awx/ui/client/src/notifications/shared/type-change.service.js
index b48a4b37f3..e0f0d44d81 100644
--- a/awx/ui/client/src/notifications/shared/type-change.service.js
+++ b/awx/ui/client/src/notifications/shared/type-change.service.js
@@ -21,6 +21,7 @@ function () {
             obj.port_required = false;
             obj.password_required = false;
             obj.channel_required = false;
+            obj.room_required = false;
             switch (type) {
                 case 'email':
                     obj.portLabel = ' Port';
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index 3e8395b3e8..98f4110cd2 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -109,8 +109,8 @@
               <div class="Modal-body" ng-bind-html="promptBody" id="prompt-body">
               </div>
               <div class="Modal-footer">
-                  <a href="" ng-class="promptActionBtnClass" ng-click="promptAction()" id="prompt_action_btn" class="btn Modal-footerButton" ng-bind="promptActionText"></a>
                   <a href="#" data-target="#prompt-modal" data-dismiss="modal" id="prompt_cancel_btn" class="btn Modal-defaultButton Modal-footerButton">CANCEL</a>
+                  <a href="" ng-class="promptActionBtnClass" ng-click="promptAction()" id="prompt_action_btn" class="btn Modal-footerButton" ng-bind="promptActionText"></a>
               </div>
           </div><!-- modal-content -->
        </div><!-- modal-dialog -->
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 23148ac758..88e42c4a3e 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -5,7 +5,7 @@ appdirs==1.4.0
 azure==2.0.0rc2
 Babel==2.2.0
 billiard==3.3.0.16
-boto==2.39.0
+boto==2.40.0
 celery==3.1.10
 cliff==1.15.0
 cmd2==0.6.8
diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt
index c904e36986..7b80797e26 100644
--- a/requirements/requirements_ansible.txt
+++ b/requirements/requirements_ansible.txt
@@ -3,7 +3,7 @@ apache-libcloud==0.20.1
 appdirs==1.4.0
 azure==2.0.0rc2
 Babel==2.2.0
-boto==2.34.0
+boto==2.40.0
 cliff==1.15.0
 cmd2==0.6.8
 cryptography==1.3.2