Merge branch 'master' into devel

Conflicts:
	contrail/setup_contrail.py
	lib/neutron_thirdparty/contrail
Merge branch 'devel' of https://github.com/Doude/devstack into devel