Catch dockerbridge not available.
Revert session variable removal to keep diff minimal.
Remove docker group.
Merge branch 'dockerbridge'