v187 22554 Fix toolbar search vs search page inconsistency.
(cherry picked from commit a75981da899c3a1df18281fc1b9be5fc842b4aad)
v187 22573 Halt alloc-cli if no credentials found.
(cherry picked from commit 4c16614eb45f1f2a28eb34acb3a905236a495c80)