catkin cleanup for release 1.9.2 (fixes #6)