Resolve actions conflicts and delete unwatned files

Bump migrations and delete some files

Resolve remaining conflicts

Fix requirements

Flake8 fixes

Prefer devel changes for schema

Use correct versions

Remove sso connected stuff

Update to modern actions and collection fixes

Remove unwated alias

Version problems in actions

Fix more versioning problems

Update warning string

Messed it up again

Shorten exception

More removals

Remove pbr license

Remove tests deleted in devel

Remove unexpected files

Remove some content missed in the rebase

Use sleep_task from devel

Restore devel live conftest file

Add in settings that got missed

Prefer devel version of collection test

Finish repairing .github path

Remove unintended test file duplication

Undo more unintended file additions

awx_collection/tools/roles/template_galaxy/templates/README.md.j2

@@ -119,11 +119,7 @@ The following notes are changes that may require changes to playbooks:
  - The `notification_configuration` parameter of `tower_notification_template` has changed from a string to a dict. Please use the `lookup` plugin to read an existing file into a dict.
  - `tower_credential` no longer supports passing a file name to `ssh_key_data`.
  - The HipChat `notification_type` has been removed and can no longer be created using the `tower_notification_template` module.
-<<<<<<< HEAD
  - Lookup plugins now always return a list, and if you want a scalar value use `lookup` as opposed to `query`
-=======
- - Lookup plugins now always reutrn a list, and if you want a scalar value use `lookup` as opposed to `query`
->>>>>>> tower/test_stable-2.6
 
 {% if collection_package | lower() == "awx" %}
 ## Running Unit Tests