Policies: fix additional diagnostics
Merge topic 'fix_policy_diagnostics' into next

ceeee63f Policies: fix additional diagnostics
Policies: omit warnings about unset policies when they are actually set to NEW
Merge topic 'fix_policy_diagnostics' into next

209980cf Policies: omit warnings about unset policies when they are actually set to NEW