Reorder keystone (part 3) to match Juno
Reorder keystone (part 3) to match Juno

Reorder keystone (part 3) to match the Juno install-guide. No functional
changes.

Change-Id: I71ac16543f8c57562398f4c574bd56cc6701764f

openstack/training-labs,dguitarbite/OpenStack-Labs,openstack/training-labs,dguitarbite/OpenStack-Labs,openstack/training-labs,dguitarbite/OpenStack-Labs