CONN-1529 Updates for Legacy GUIs
Merge branch 'CONNECT_integration' into CONN-1529
Merge pull request #966 from jsmith2/CONN-1529

Conn 1529