Fix catkin workspace for recursive packages
merging