Merge "Improved groovy syntax checking configuration"