Update quantum and vswitch submodules
Remove unneeded and/or unimplimented features from quantum template

The qpid call is unneeded and in fact overrides existing behavior
in a broken way. The metadata server stuff isn't implemented
currently in the upstream branch.