ACCUMULO-1873 merging patch
ACCUMULO-1873 merging patch

mikewalch/accumulo,phrocker/accumulo,lstav/accumulo,ivakegg/accumulo,milleruntime/accumulo,joshelser/accumulo,ctubbsii/accumulo,keith-turner/accumulo,phrocker/accumulo,joshelser/accumulo,mikewalch/accumulo,joshelser/accumulo,phrocker/accumulo,ctubbsii/accumulo,mjwall/accumulo,phrocker/accumulo-1,phrocker/accumulo-1,milleruntime/accumulo,ivakegg/accumulo,mjwall/accumulo,ivakegg/accumulo,joshelser/accumulo,joshelser/accumulo,dhutchis/accumulo,ivakegg/accumulo,joshelser/accumulo,ctubbsii/accumulo,adamjshook/accumulo,apache/accumulo,apache/accumulo,mikewalch/accumulo,mikewalch/accumulo,phrocker/accumulo-1,adamjshook/accumulo,ctubbsii/accumulo,mikewalch/accumulo,joshelser/accumulo,phrocker/accumulo,milleruntime/accumulo,ctubbsii/accumulo,milleruntime/accumulo,adamjshook/accumulo,dhutchis/accumulo,phrocker/accumulo,apache/accumulo,mikewalch/accumulo,adamjshook/accumulo,ctubbsii/accumulo,lstav/accumulo,dhutchis/accumulo,ivakegg/accumulo,phrocker/accumulo-1,dhutchis/accumulo,keith-turner/accumulo,mikewalch/accumulo,adamjshook/accumulo,apache/accumulo,mjwall/accumulo,milleruntime/accumulo,keith-turner/accumulo,dhutchis/accumulo,lstav/accumulo,ivakegg/accumulo,phrocker/accumulo,dhutchis/accumulo,keith-turner/accumulo,lstav/accumulo,apache/accumulo,dhutchis/accumulo,phrocker/accumulo-1,lstav/accumulo,phrocker/accumulo,apache/accumulo,mikewalch/accumulo,milleruntime/accumulo,adamjshook/accumulo,ctubbsii/accumulo,keith-turner/accumulo,mjwall/accumulo,keith-turner/accumulo,phrocker/accumulo-1,mjwall/accumulo,joshelser/accumulo,phrocker/accumulo,dhutchis/accumulo,lstav/accumulo,keith-turner/accumulo,mjwall/accumulo,phrocker/accumulo,lstav/accumulo,adamjshook/accumulo,ivakegg/accumulo,milleruntime/accumulo,dhutchis/accumulo,adamjshook/accumulo,mjwall/accumulo,adamjshook/accumulo,apache/accumulo,phrocker/accumulo-1