Fix config options deprecated in Juno

http://docs.openstack.org/juno/config-reference/content/keystone-conf-changes-juno.html

Change-Id: I7ba69ca616bd7ae772b0a45a9fda5910fd66071c
Merge "Fix config options deprecated in Juno"