changes to User and VM, for elasticIP
some chenges to Ec2Wroker as well.