Merge branch 'scott_remove_channel_from_task_manager' of github.com:paritytech/substrate into scott_remove_channel_from_task_manager