NXP-12002: Use UTC timezone instead of client's one for generated conflicted file name
Merge branch 'master' into 5.6.0