CRM-11320 this makes the api stable from 4.2 to 4.3

Conflicts:

	api/v3/Contribution.php
CRM-11320 fix error in test
Merge pull request #863 from eileenmcnaughton/CRM-11320

Crm 11320 - make api stable for 4.3