Clean up dependencies so integration tests use 2.11.
Fix issue with cancelling tasks and intermitten NPE.