HV-885


https://hibernate.atlassian.net/browse/HV-885

This PR is aiming at branch 4.3 because my benchmark is validated on EAP 6.3, I guess it could be applied on master too?