merge: upstream fixes (mutt/default)

 * Note which ssl config vars are GnuTLS or OpenSSL only
 * Add message count to $move quadoption prompt
 * Add %R (number of read messages) for $status_format
 * Updated French translation
 * Add $change_folder_next option to control mailbox suggestion order
 * Fix $smart_wrap to not be disabled by whitespace-prefixed lines
 * Remove useless else branch in the $smart_wrap code