CLOUDIFY-1921 Updated windows AMI ID
CLOUDIFY-1895 Fixed custom cloud driver to wait for thread termination