Fixes for boto_elb for VPC
Ensure both availability_zones and subnets are not provided
Merge pull request #15253 from saltstack/bp-15029

Backport #15029 to 2014.7