Rearrange feature dependencies and fix site categorization

Ensure that the Groovy 2.1 feature is available from the update site.