Refactored the dock widget to use the info tree from the ADS. Re #7253
Correction to a unit test. Re #7253
Merge branch 'feature/7253_workspace_groups_and_dock' into develop