ACCUMULO-1667 more work on making online and offline wait