Split out the uncontroversial logging changes

This pull has one additional commit that the original didn't, a small fix to the ConnectionDropped message.