Fix merge isssues (need to be revisited). These changes were required to ensure v6 VM launch succeeds