ACCUMULO-2195 fixed bulk import w/ viewfs
ACCUMULO-2201 Fix compilation error in 1.4.x.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'