Refactor and cleanup of all payment gateway pathway support.
Merge remote branch 'origin/7.x-3.0-qa' into 7.x-3.0-qa