Update Groovy to 2.1.7
Use localeResolver in LocaleAwareNumberConverter
Merge branch '2.3.x'