Merge pull request #4606 from johanv/CRM-15636-price_set_event_and_contribution