Chip, Can you apply this fix to 4.1? There is a better fix for this in master, but that is more involved. This fix will allow NiciraNvp users to create VPC's without having to edit the database and has only minimal impact on 4.1 branch.
The patch is in the ticket as it can't be applied to master. Cheers, Hugo