Merge "Refactor configuration for ConfigPersister."