Fix keystone startup error

Keystone fails to start as it is missing keystone-paste.ini, because it
is restarted after keystone.conf is dropped, but before the other config
files are created.

This has broken Jenkins builds for a few days:
http://jenkins.uk.rs.wherenow.org/job/Stackforge_Cookbooks_AIO_Matrix/1110/label=performance14-centos/artifact/stackforge-aio/logs/log/keystone/keystone-startup.log
http://jenkins.uk.rs.wherenow.org/job/Stackforge_Cookbooks_AIO_Matrix/1110/label=performance14-centos/console

Change-Id: I30669e807551af4a2aed9425274603aed5be63c2
Merge "Fix keystone startup error"