Rebase changes
CRM-5039 - QA Fix

----------------------------------------
* CRM-5039: Events don't always limit registrations to "max participants" setting
  https://issues.civicrm.org/jira/browse/CRM-5039
Merge pull request #4726 from atif-shaikh/CRM-5039

CRM-5039 - Events don't always limit registrations to "max participants"...