Merge pull request #3 from ros/master

updates from ros organisation
Merge pull request #4 from ros/master

update from ros
change branch for doc jobs
Merge pull request #5403 from ipa320/master

change branch for doc jobs