partial fix on membership type's stompiness on updates to test pr

Conflicts:
	CRM/Member/BAO/MembershipType.php
sync 4.4 testclass with master