Merge remote-tracking branch 'origin/master'

Conflicts:
	tools/deployers/install_devstack.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	tools/deployers/install_devstack.py