Fix bug to allow stemcell deletions on AWS
vpc support (static network type) in agent for aws
vpc support in aws cpi
vpcsupport in aws cpi
fixing borken tests
this is the actual merge
picked a cherry instead of descending into merge hell