EUCA-6642 Update groovy -> 2.1.5
Merge branch 'dev/mspaulding/EUCA-6642' into testing