Started to work on apply_colocated
Trying to circumvent random 'endpoint not connected' errors during shutdown
More work on apply_colocated
Fixing test for apply_colocated
Merge branch 'fixing_1061'