NSS: Rearrange ciphers-, parsing-, and protocol-related patches
    
    In addition, remove (or better, do not include anymore) unused
    variables *variant* and *range* that were forgotten to be
    removed when landing patch openldap-nss-protocol-version-new-api.patch
    in commit 9e30b98.
    
    Related: #1435689