Merge "Avoid postgres CategoryMembershipChangeTest failures"