Groovy 2.2.1: add new libs, remove old and update version references
Merging new code changes from 2.2.0 to 2.2.1.
Fix some failing test cases