Bug 914593 - Only show search engine selection if more than one search engine defined
Merge branch '914593' of https://github.com/benfrancis/gaia into 914593
Turn on intermittent integration test to test on Travis