Another round of changes to prepare ansible-test for supporting collections to help keep later PRs a manageable size.
Matt Clay