Support for different Windows images in Execution Plans

Change-Id: I32eaad36edcb889b448c45ba36f4e97f7c87d1e5
Merge "Support for different Windows images in Execution Plans" into release-0.2