ACCUMULO-2170 Fix up changes, split 1.5.1 changes from 1.5.0 changes, and update for recent fixes since rc1
ACCUMULO-2356 Remove terrible static blocks and use BeforeClass annotations.