Merge in upstream change to properly decode base64 certificates with whitespace.