Add race condition for keystone.log

Change-Id: Icb8e01d3228f67dec5c61998b1bea7578fb79651
Merge "Add race condition for keystone.log"