ACCUMULO-3220 Make sure to re-set the local cipher variable when it wasn't initialized
Merge branch '1.6'