Merge branch 'hydro-devel' into rtt_dynamic_reconfigure