ACCUMULO-1220 added some advanced recovery options
Merge branch '1.6.0-SNAPSHOT'