Changing the dev-stack web-ui dev-env based on new packaging scheme
Use the OpenContrail Neutron plugin

Use the OpenContrail Neutron plugin instead of the Neutron fork and make
some cleanup on unsued file and code.
Merge pull request #43 from biswajit-mandal/master

Changing the dev-stack web-ui dev-env based on new packaging scheme
Merge pull request #42 from Doude/use_OpenContrail_neutron_plugin

Use the OpenContrail Neutron plugin
Update neutron config based on modular plugin
VIF create now needs xconnect option
Merge remote-tracking branch 'upstream/master'

Conflicts:
	contrail/neutron_v4.patch
	lib/neutron_plugins/contrail
	lib/neutron_thirdparty/contrail