Merge "Add .enf files for virtual-mcp11-ovs/dvr models"