RightScale Windows bootstrap
Merge branch 'master' of https://TTimo@github.com/TTimo/es_build.git