Merge "Remove the sample configuration file for keystone"