Merge "Bug 1666: Fixing the clustering config file issue"