Merge "Hook the Distributed Data store into the config sub-system"