Merged ipa320/groovy_dev with ros-industrial/hydro-devel