Import upstream commit that fixes pageAction-related test
Import upstream commit that fixes pageAction-related test

This imports commit 9e1691779afd5943e4a12ff95e69722b41f5c185 from mozilla-central
Bug 1221539 - Add search engine discovery to the page action menu. Part 1: Page action changes.

mozilla-services/pageshot,mozilla-services/pageshot,mozilla-services/screenshots,mozilla-services/screenshots,mozilla-services/pageshot,mozilla-services/screenshots,mozilla-services/pageshot,mozilla-services/screenshots