Merge "BUG 5014 - init topology for config datastore"