I think that for 1.3 we want to change the code such that server subkey wins by default as I don't think that will break anything if the server subkey is the same as the client subkey. I'm not sure how we get to a point where we generate server subkeys though.