Issue #2158 - add VPC subnet ID support

Here are the changes for Issue #2158, straightforward but untested against AWS just yet.  Low risk.