Merge pull request #12942 from twomice/CRM-19751_search_on_hold_form