ACCUMULO-1166 Merge 1.5 to trunk