GRAILS-11625 - few more conditionals added to spec
Merge pull request #518 from droggo/2.4.x

GRAILS-11625 - few more conditionals added to spec