Allow VPC and EC2 Classic in one project

Change-Id: I86a32b26429ccca43e3c0865e12501b567ef1503