initial changes to enable deployment to custom VPC/subnets