Partial CRM-12618: Event registration edit screen for additional registrants is incorrect 

Arrggg ... I still cannot create a pull request with just one commit. Only the latest commit in this PR is to be merged in.

This is just a partial fix, but it fixes the most dangerous issue. See http://issues.civicrm.org/jira/browse/CRM-12618 for more info.