Apply patch openssh6.5-server-logging.diff to branch hpn-server-logging.
Merge branch 'hpn-server-logging' into hpn

* hpn-server-logging:
  Apply patch openssh6.5-server-logging.diff to branch hpn-server-logging.

Conflicts:
	kex.c
Applied patch http://auditing-sshd.googlecode.com/svn/trunk/patch/isshd-6.2p2-nohpn.patch for NERSC Bro SSH instrumentation version 3.12 to branch nersc-isshd.