Merge "Fixes and tests for ApiErrorFormatter ILocalizedException handling"