ACCUMULO-1395 Generate config without removing examples
Merge branch '1.6.0-SNAPSHOT'