Backport: Contribution form improvements #3086
https://github.com/civicrm/civicrm-core/pull/3086