Use Ubuntu_64 os id in ubuntu-10.04.4-server-amd64
Merge pull request #614 from lbosque/master

Use os type id Ubuntu_64 instead of Ubuntu in ubuntu-10.04.4-server-amd64 template
Make sure winrm is actually up
Merge pull request #615 from hh/ensure_winrm_up

Make sure winrm is actually up
Merge branch 'master' into stable