Catkinized enu

It's probably best to merge this into new groovy-devel and hydro-devel branches.  Otherwise it's going to destroy your current workspaces.