Merge remote-tracking branch 'origin/release_3.1.2' into devel

awx/main/tests/functional/test_python_requirements.py

@@ -1,11 +1,13 @@
 
 import os
 import re
+import pytest
 from pip.operations import freeze
 
 from django.conf import settings
 
 
+@pytest.mark.skip(reason="This test needs some love")
 def test_env_matches_requirements_txt():
     def check_is_in(src, dests):
         if src not in dests: