Fix issue with keystone

Change-Id: Idfeb08fe6946c06b8e6ee933a8ac4b6d62f4406e
Closed-bug: #1310615
Merge "Fix issue with keystone"