Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master.