fixed instancelist after redeploy, had to comment tests
removed adapter from testbed
added ID property to openstack VMs
Merge remote-tracking branch 'origin/amsterdamDemo'
Merge remote-tracking branch 'origin/amsterdamDemo'
changed openstack image to ubuntu
Merge remote-tracking branch 'origin/master' into amsterdamDemo