ESDEV-2195 Fix PayPal related bugs
ESDEV-2393 0005861: No redirect to paypal from step 3 to 4 in mobile template

Fixing when PayPal is default payment.
(cherry picked from commit 18546bd)
(cherry picked from commit 461d1a8)
Merge remote-tracking branch 'origin/b-3.1' into b-3.1