[AAP-47877] Backport collection updates (#6992)

* Update collection args (#16025)

* update collection arguments

* Add integration testing for new param

* fix: sanity check failures

---------

Co-authored-by: Sean Sullivan <ssulliva@redhat.com>
Co-authored-by: Alan Rominger <arominge@redhat.com>

* update formatting for sanity testing

* fixing indentation for sanity suite

* adjust tests to use new token name

* update tests to use aap_token instead of controller_oauthtoken

* add back aliases for backward compat

* we have integration tests that still leverage the old token name
* while we can rename these, this tells me that customers might still
  have them in the wild and breaking them in a z stream is no bueno

* revert alias changes

---------

Co-authored-by: Peter Braun <pbraun@redhat.com>
Co-authored-by: Sean Sullivan <ssulliva@redhat.com>
Co-authored-by: Alan Rominger <arominge@redhat.com>

awx_collection/test/awx/test_organization.py

@@ -20,7 +20,7 @@ def test_create_organization(run_module, admin_user):
         'controller_username': None,
         'controller_password': None,
         'validate_certs': None,
-        'controller_oauthtoken': None,
+        'aap_token': None,
         'controller_config_file': None,
     }
 
@@ -53,7 +53,7 @@ def test_galaxy_credential_order(run_module, admin_user):
         'controller_username': None,
         'controller_password': None,
         'validate_certs': None,
-        'controller_oauthtoken': None,
+        'aap_token': None,
         'controller_config_file': None,
         'galaxy_credentials': cred_ids,
     }
@@ -78,7 +78,7 @@ def test_galaxy_credential_order(run_module, admin_user):
         'controller_username': None,
         'controller_password': None,
         'validate_certs': None,
-        'controller_oauthtoken': None,
+        'aap_token': None,
         'controller_config_file': None,
         'galaxy_credentials': cred_ids,
     }

awx_collection/test/awx/test_token.py

@@ -18,7 +18,7 @@ def test_create_token(run_module, admin_user):
         'controller_username': None,
         'controller_password': None,
         'validate_certs': None,
-        'controller_oauthtoken': None,
+        'aap_token': None,
         'controller_config_file': None,
     }