Move logic for config format into ConfigStringUtils (commit: 39b0e87)
fix failing test (commit: 9f7dbc2)