CRM-14995 contributions disappearing on pledge edit

Conflicts:
	CRM/Pledge/Form/Pledge.php
CRM-14995 tidyups
Merge pull request #3681 from eileenmcnaughton/CRM-14995

CRM-14995 contributions disappearing on pledge edit