Merge branch 'bug-15828-TooManagerProvider' into bug-15828-ToolManagerProvider-integration
Conflicts: Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp