Do not use abbreviated config group names (zookeeper)

Using abbreviated config group names just makes the config file harder
to understand, so just use full name.

zk => zookeeper

Change-Id: Ia8b3ff9201365477003535600e419540deae7341
Merge "Do not use abbreviated config group names (zookeeper)"