Update keystone connection wrapper

Closes-bug: 1248166
Merge pull request #786 from Mirantis/bug1248166

Update keystone connection wrapper