MFC r274549:

Make it possible to do "iscsictl -Rt xxx -p yyy", to remove a session
that matches both -t and -p.

Sponsored by:	The FreeBSD Foundation
MFC r274621:

The "intr" option is NFS-specific; fix examples in auto_master(5).

Sponsored by:	The FreeBSD Foundation