Merge remote-tracking branch 'origin/master'

Conflicts:
	devstack/plugin.sh
changes/09/275109/1
Dmitriy Ukhlov 7 years ago
commit 1e643aaad7

Diff Content Not Available