Cert/Key recovery is successful when the cert serial number and key id on the ldap user mismatches
    
     Fixes this bug #1381375.
    The portion this patch fixes involves URL encoding glitch we encountered when recovering keys using
    the "by cert" method.
    
    Also this bug addresses:
    
    Bug 1379379 - Unable to read an encrypted email using renewed tokens
    The URL encoding problem was affecting the proper verification of this bug.
    
    and
    
    Bug 1379749 - Automatic recovery of encryption cert is not working when a token is physically damaged and a temporary token is issued
    
    The URI encoding was also making this bug appear to fail more than it should have.
    There is also a minor fix to the feature that makes sure it works.
    
    This small fix is in TPSEngine.java where the constant for GenerateNewAndRecoverLast scheme is declared.