Merge remote-tracking branch 'origin/vs/test_default_search_provide_can_be_changed' into vs/test_default_search_provide_can_be_changed

# Conflicts:
#	modules/browser_object_navigation.py
#	tests/address_bar_and_search/test_default_search_provider_change.py

Author: vsangereanMOZ