Merged! [MERGE] Avoid unnecessary reconnections to old servers when the first HPSS is an error in the right protocol version.

[Bundle Buggy]

This change has been merged.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C20080530044506.GA11180%40steerpike.home.puzzling.org%3E