Release cleanup 3.6.0 Release port cleanup for 4.x

[jlarson4]

Description

• Fixed a series of test and imports that were broken on migration to dev-4.x
• Updated documentation to reflect all of the latest values for our systems
• Refactored testing and architecture adapters to reduce code duplication and promote faster architecture development in the future.

Type of change

• Bug fix (non-breaking change which fixes an issue)
• This change requires a documentation update

Checklist:

• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• I have not rewritten tests relating to key interfaces which would affect backward compatibility