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

Change-Id: I1863e93cdedaf39f766608e45012bdaa984f4f4c
(cherry picked from commit 549b97d730239d0a2e00c8d1d0fcac9993f6decd)