catkin, opencv2 and cv_bridge fixes.