Merge branch 'release_2.3' into devel

* release_2.3: (54 commits)
  Upgrade changelog for 2.3
  Purge superlance
  Purge an old supervisor config
  Require chris-lea libzmq3
  Use the htpasswd command, not the module
  Fix a playbook syntax error for postgres
  Ensure postgres is started earlier in setup role
  Allow customizing npm path
  Include RPM-GPG-KEY-ansible-release for all releases
  Simplify GPG keys
  Correct broken RPM-GPG-KEY
  Use gpg --passphrase for signing CHECKSUM
  Handle rpm --addsign pasphrase prompts
  Adding docker-compose development workflow
  Fix license in spec file.
  Updates to selinux policy for some munin plugins
  ansible 1.8.4 requires sudo:true when using sudo_user
  Fix expect script timeout
  Disable timeout and correct sign.exp error
  Fix expect script hang
  ...

awx/__init__.py

@@ -41,9 +41,14 @@ def prepare_env():
     local_site_packages = os.path.join(os.path.dirname(__file__), 'lib',
                                        'site-packages')
     site.addsitedir(local_site_packages)
-    # Work around https://bugs.python.org/issue7744
-    # by moving  local_site_packages to the front of sys.path
-    sys.path.insert(0, sys.path.pop())
+    try:
+        index = sys.path.index(local_site_packages)
+        sys.path.pop(index)
+        # Work around https://bugs.python.org/issue7744
+        # by moving  local_site_packages to the front of sys.path
+        sys.path.insert(0, local_site_packages)
+    except ValueError:
+        pass
     # Hide DeprecationWarnings when running in production.  Need to first load
     # settings to apply our filter after Django's own warnings filter.
     from django.conf import settings