Ignore bare disabled queues in the simple search.

Typing General into simple search results in a search for Queue =
'General', even if your General Queue is disabled.  You can still search
for queue:General and search in a disabled Queue.
Merge branch '4.0/simple-search-ignore-disabled-queues' into 4.0-trunk