ACCUMULO-3120 Replacing references to docs/config.html to the Configuration Management portion of the user manual.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'