Merge "[573322] MockServer fix failing test when you not have Locale.ENGLISH"