Decom'ing search 21-36 removing from dsh groups and dhcpd

Change-Id: I1c252b310365d845d1d8e381dbe2fbbef2905269