Merge branch 'CRM-13067-bao-prep' of...

Merge branch 'CRM-13067-bao-prep' of https://github.com/eileenmcnaughton/civicrm-core into CRM-13067-bao-prep

Conflicts:
	api/v3/Membership.php
	tests/phpunit/api/v3/MembershipTest.php

----------------------------------------
* CRM-13067-bao-prep:
  http://issues.civicrm.org/jira/browse/CRM-13067-bao-prep