8a9a700cfc
* Bring config.yaml.j2 in line with upstream * Update config.yaml.j2
* Bring config.yaml.j2 in line with upstream * Update config.yaml.j2