Revert "ACCUMULO-2170 Collapse down spacing and remove 1.5.0 changes."
Revert "ACCUMULO-2170 Collapse down spacing and remove 1.5.0 changes."

This reverts commit a27f60b2e69c1df056ca6b1306017d93118d81f3.

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