Merge branch 'release_3.1.3' into devel

* release_3.1.3: (52 commits)
  ack fact scan messages
  making ldap user/group search fields into codemirror instances
  removing UI parsing for LDAP User and Group Search fields
  Allow exception view to accept all valid HTTP methods.
  Restore ability of parsing extra_vars string for provisioning callback.
  Fix up backup/restore role broken in f7a8e45809758322d9ee41c5305850dd70ed5faf
  Stop / start ansible-tower-service during restores
  value_to_python should encode lookup fields as ascii
  fix brace interpolation on standard out pane
  Adjust some hardcoded usages of 'awx' to use 'aw_user' and 'aw_group'.
  Pull Spanish updates from Zanata
  Temporarily grant awx user createdb role
  Stop giving ownership of backups to postgres
  don't display chunked lines'
  Add dropdown li truncation with ellipsis
  CTiT -> adhoc modules should allow the user to add new modules
  Remove task that was replacing the supervisor systemd tmp file
  Fix failing supervisorctl commands on RH-based distros
  Give ownership of the supervisor socket to awx
  Setting for external log emissions cert verification
  ...

awx/main/tests/functional/test_jobs.py

@@ -2,6 +2,8 @@ from awx.main.models import Job, Instance
 from django.test.utils import override_settings
 import pytest
 
+import json
+
 
 @pytest.mark.django_db
 def test_orphan_unified_job_creation(instance, inventory):
@@ -22,3 +24,15 @@ def test_job_capacity_and_with_inactive_node():
     assert Instance.objects.total_capacity() == 100
     with override_settings(AWX_ACTIVE_NODE_TIME=0):
         assert Instance.objects.total_capacity() < 100
+
+
+@pytest.mark.django_db
+def test_job_notification_data(inventory):
+    encrypted_str = "$encrypted$"
+    job = Job.objects.create(
+        job_template=None, inventory=inventory, name='hi world',
+        extra_vars=json.dumps({"SSN": "123-45-6789"}),
+        survey_passwords={"SSN": encrypted_str}
+    )
+    notification_data = job.notification_data(block=0)
+    assert json.loads(notification_data['extra_vars'])['SSN'] == encrypted_str