[connector] fix#939 `search` cmd became possible to disable by options
Merge branch '2.x' into 2.1