Adding Service-id to endpoint-list
Merge branch 'master' of https://github.com/mfaraji/python-keystoneclient