[release/0.8] Cherry-pick PrepareLayer fixes#1131

dcantah merged 2 commits intomicrosoft:release/0.8microsoft/hcsshim:release/0.8from

dcantah:cp-preparelayerdcantah/hcsshim:cp-preparelayerCopy head branch name to clipboard