Merge branch '6658-policy_name_change_trigger_update' into 'develop'

should fix #6658 - prevent change only policy_name to trigger all policy user rewritten

Closes #6658

See merge request !1860