FALCON-652 EntityUtils tests are failing. Contributed by Ajay Yadav