Synchronizing hydro-devel to groovy-devel

`hydro-devel` and `groovy-devel` are not synchronized. For example, 4b02c226918dd56f10f733b09b6578039de5c55b is only commited into `groovy-devel`

(Related to https://github.com/ros-visualization/rqt_common_plugins/issues/126, which I expect to prevent from this to happen in the future.)