NXP-11417: Let Hibernate merge parameters in audit log query
Merge branch 'master' into 5.6.0