Updated some package.xml and CMakeLists.txt files.