Merge change I154386b1 into eclair-mr2

* changes:
  Use unbundled QSB for global search