ACCUMULO-3128 Screwed up the conditional
Merge branch '1.6.1-SNAPSHOT'