[#9826] fix errant creation of new PolicyTemplates
[#9826] Fix errant creation of Policy Templates

add changelog msg
[#9826] Fix errant creation of Policy Templates

Merge branch 'bug-9826' into release-2.2

* bug-9826:
  [#9826] Fix errant creation of Policy Templates
  [#9826] fix errant creation of new PolicyTemplates