Backport OpenStack Keystone v2 408 request timeouts

Backport of #369 to 1.7.x branch