added --enable-nat-transport and --disable-vendor-id configuration options