Fixing PayPal tests
(cherry picked from commit 4404fc4)
Merge remote-tracking branch 'origin/b-3.1' into b-3.1