Conforming to the change in REP-0127
Merge branch 'groovy-devel' of https://github.com/130s/rqt_common_plugins into groovy-devel