Fix for delete error in Hyper-V - missing CONF imports

Looks like we need to import the options explicitly

Fix for LP# 1140759

Change-Id: I21c09330c209f4e2178b6c0a6300944cd58d4423
Merge "Fix for delete error in Hyper-V - missing CONF imports"
Merge remote-tracking branch 'm_src_repo/master' into build-temp