CRM-15296 test for behaviour on renew with recurring

Conflicts:
	CRM/Member/BAO/Membership.php
	tests/phpunit/api/v3/ContributionPageTest.php