Fix missing host custom dict & CV prefix for _HOST/_SERVICE macros.

Refs #2414
Fix wrong function call.
Merge branch 'fix/i2-cv-host-2414' into support/1.4

Fixes #2414