Add Calico mechanism driver to Neutron
Merge branch 'master' into ubuntu

Conflicts:
	setup.cfg