Fix some "%Q" behavior in PhortuneMerchantQuery

Summary: Ref T13217. This older query does some manual joins; update it for more modern joins.

Test Plan: Ran instances/ unit tests and got a clean result, browsed Phortune merchants.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13217

Differential Revision: https://secure.phabricator.com/D19820