useorocos: readded presence of package.xml as a condition to select catkin buildsystem and allow to override the automatic choice by setting cmake variables manually
Merge branch 'useorocos-auto-linking-rosbuild-updates'