Merge branch 'rtt_roscomm-template-refactoring' into hydro-devel
Merge branch 'orocos-generate-package-cleanup' into hydro-devel