Add a -N option that prints the jail name rather than its number.

MFC after:	3 weeks
Upgrade to OpenSSH 6.2p2.  Mostly a no-op since I had already patched
the issues that affected us.