CRM-14921 retain context from custom search
Merge pull request #3567 from lcdservices/CRM-14921

CRM-14921 retain context from custom search