GROOVY-4255, GROOVY-4787, GROOVY-6212 fixes

[Pascal Schumacher]

Hi Paul,

I'm wondering why these fixes are only in head (2.5) and not in the 2.4 
bugfix branch?

-Pascal