NXP-10119: more explicit failure message in conflict test
Merge branch 'master' into 5.6.0