ACCUMULO-3220 Fail fast if the provided cipher isn't a block cipher.
Merge branch '1.6'