Bringing in Amazon VPC changes in nova master