Merge "Add test for dhcp-less vmedia based deployment"