CRM-13280 - Updates for changing event payment fields location

These are the changes referenced in the issue.