CRM-14701 fixes - Form data not retained subsequent to contribution page on behalf of fix

https://issues.civicrm.org/jira/browse/CRM-14701