Merge pull request #1 from ros/master

update from ros
Merge pull request #3 from ros/master

update from ros
add workaround for rpm
Merge pull request #5787 from ipa-fmw/master

cob_extern: add workaround for rpm