Merge pull request #6260 from edx/will/combine-intro-and-make-payment

lms/djangoapps/verify_student/tests/test_views.py

lms/djangoapps/verify_student/views.py

lms/envs/common.py

lms/static/js/verify_student/pay_and_verify.js

lms/static/js/verify_student/views/intro_step_view.js

lms/static/js/verify_student/views/make_payment_step_view.js

lms/static/js/verify_student/views/requirements_view.js

lms/templates/verify_student/intro_step.underscore

lms/templates/verify_student/make_payment_step.underscore

lms/templates/verify_student/pay_and_verify.html

lms/templates/verify_student/requirements.underscore