Less keystone configuration internally.
Merge branch 'keystone-adv-usage' into working