Pull Damon's Catkin Changes into hydro-devel

We should leave groovy-devel non-catkinized (as it was when we 'released' it) so that developers have a consistent version.

The catknization changes should instead go into Hydro.

@damonkohler, @130s, @stonier Does this sound reasonable?