MT#9829 allow ngcp-templates-pro-hylafaxplus-diva too on ngcp-templates-[pro|carrier]

(cherry picked from commit 549b97d730239d0a2e00c8d1d0fcac9993f6decd)

Change-Id: I32cc28048a72aa533ccfff57e4df4f750423a69c