OK, trunk.6 patch looks good. +1 as long as the following two items are taken care of:
- There are still some conf values not set by String constants but rather string literals. Another jira should be opened to finish this conversion.
- We should do a pass over the user-facing documentation and check that any conf names that have been changed in this patch are also changed in the documentation. This can also be done in a separate jira.
Also, for the conf file versioning, we should probably keep to what we do with protocols and versions, noting the reason for the last change in number (such as ClientProtocol version). If we are going to bump the number for each new configuration value, we'll need to make sure that's enforce through code review.