Merging in change that allows tests to connect to different accumulo instances
from to1.6.