Merge pull request #892 from aledsage/managementcontextcleanupintest-aled

ManagementContext tearDown in tests
Merge branch 'master' into feature/tasks-tree-4