(cherry picked from commit 648a724dfc) Conflicts: plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
648a724dfc