Merge branch 'master' of https://github.com/Doude/devstack

Conflicts:
	lib/neutron_thirdparty/contrail
Merge branch 'master' of https://github.com/Doude/devstack