fixes #1871, #1879 - add VPC support to EC2 compute resource

Based on patch from Romain Vrignaud <romain@yakaz.com>