Bug 1062984 - Make directory service query for bookmark migration more resilient; r=fabrice

--HG--
extra : rebase_source : 54d6ba208d20053ae9888baf8450f2c251c7900c