Merge branch '4052-fix-sub-resume-issues' into 'develop'

fixes issues where PayPal or Stripe actions seemingly are not processing on...

Closes #4052

See merge request !3857
Status Job ID Name Coverage
  Unit
passed #6705
phpunit

00:00:55

 
  Acceptance
passed #6706
juice
codeception

00:00:13