internal/hcs cleanup; and callbackNumber type #2602

helsaawy wants to merge 3 commits intomicrosoft:mainmicrosoft/hcsshim:mainfrom

helsaawy:callback-counterhelsaawy/hcsshim:callback-counterCopy head branch name to clipboard