ACCUMULO-2967 Unknown Host should result in timeout.

- Tests that we get an exception within a reasonable bound
- Changes timeout condition to check prior to place where an exception can be thrown.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT