Re-ordering keystone templates.

Currently, if not using templated catalog backend or using a remote
keystone-paste.ini, service(keystone) does not get restarted before the
registration recipe gets called. This causes keystone user/tenant/role
bootstrapping to fail. This re-ordering resolves this issue.

Change-Id: I97c81b3086a687b28cd8ce329ec70c461c5b73b4
Closes-Bug: #1316732
Merge "Re-ordering keystone templates."