Adds OSSN-0042 Keystone Scoping

Closes-bug: #1341816
Change-Id: I56975221e62de4dd6272cce1a69e5742ca5b0f2f
Merge "Adds OSSN-0042 Keystone Scoping"