sip 4.14.7

Closes #20755.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
msmtp: Delete unnecessary option code

Msmtp will enable support for the OS X Keychain by default on Macs.  No need to ask for it.

Closes #20753.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>