* stable-2.10
  Export VLAN nicparam to NIC configuration scripts
  Fix gnt-network client to accept vlan info
  Fix query mechanism wrt networks and vlans
  Fix LUNetwork* hooks to comply with docs
  Fix LUNetworkConnect wrt vlan

Conflicts:
	lib/client/gnt_network.py
	lib/cmdlib/network.py
	qa/qa_network.py
	src/Ganeti/OpParams.hs
Resolution:
	lib/cmdlib/network.py: use stable-2.11 version
	lib/client/gnt_network.py:  use stable-2.10 version
	Rest: union of changes

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>