Switch _map_instances from novang to novav21

Switch _map_instances from novang to novav21 module

Change-Id: I806b6a276149320964b425ee534d80ffe1eeafef
Related-Prod: PROD-26861 (PROD:26861)
(cherry picked from commit 37664d8da45993940c2f6368b9d7209db209a995)
2 files changed