fixes to uvmboot#2494

ambarve merged 2 commits into

microsoft:mainmicrosoft/hcsshim:mainfrom

ambarve:uvmboot_fixesambarve/hcsshim:uvmboot_fixesCopy head branch name to clipboard