Better results for overriding Spring's Locale resolution behavior for #869