ACCUMULO-1599 Use target directory more