Backport OAuthSignatureCalculator fix, close #506