modify keystone v3
Merge remote-tracking branch 'origin/master'

Conflicts:
	tests/lib/test_db2.py