These changes are needed to differentiate Windows images. Signed-off-by: John Starks <jostarks@microsoft.com>