[DO NOT MERGE] Groovy 2.2 upgrade

* dependency upgrade to spock-0.7-groovy2.0
* renamed some private methods to avoid name collision - necessary
* other fixes