moving functions / cleaning up
Merge branch 'ctaskbrowser-sub-service-ports' into toolchain-2.6
Merge branch 'toolchain-2.6' into catkin