Issue #3256597 by Renrhaf, lhridley, ressa, adriancid, jidrone: Replace...

Added changes from previous merge request and changed the minimum required core version for admin toolbar search module.