Adding more vlan support
Merge branch 'opendaylight' of https://github.com/CiscoSystems/quantum into opendaylight

Conflicts:
	etc/quantum/plugins/opendaylight/opendaylight_quantum_plugin.ini