Merge 'trunk' into 'subquery'

r5522@rkinyon-lt-osx (orig r5521):  jnapiorkowski | 2009-02-18 14:35:19 -0500
I guess ensure_connected does not have a return value... so I cannot use it. Fix for replication issue where replicants always get marked as unavailable even when there is no problem with them