Merge pull request #6523 from eileenmcnaughton/CRM-16955

CRM-16955 move setting of contact_id to parent form

diff --cc CRM/Contribute/Form/AbstractEditPayment.php
Simple merge

diff --cc CRM/Member/Form/Membership.php
Simple merge