Wait for networkRecoveryInterval on any exception

Otherwise we go into an infinite reconnection
loop that logs errors.
merge bug26187 into stable
Fix two Javadoc references
merge stable into default