Bug 971964 Attempt to fix intermittent places tests
Merge pull request #1417 from jsantell/971964-fix-places-tests

Bug 971964 Attempt to fix intermittent places tests