MFH (r263234, r263691, r266465, r290671, r290672, r290673, r290674, r294320, r294322, r294324, r294330, r294469, r294494, r294466)Reduce diffs to head in preparation for removing HPN and None.
MFH (r263712): upgrade openssh to 6.6p1MFH (r264308): restore p level in debugging output