ACCUMULO-3373 Get thrift generation working again.
ACCUMULO-3372 avoid holding the lock while constructing a cached object
ACCUMULO-3372 merge 1.6 to master