Fix MM and sTGC Overlay configuration in CA-based configuration (ATLASSIM-5879)
Fix MM and sTGC Overlay configuration in CA-based configuration.
Should fix ATLASSIM-5879 (once the changes are swept to master). I have enabled the additional tests that were failing in master for 22.0 also.