Restore compatibility with Flex and Groovy on Sonar 3.6