Change _switch_to_keyboard() to switch_to_keyboard()
Merge branch 'master' of https://github.com/mozilla/gaia-ui-tests into switch_to_keyboard
Solved conflicts: gaiatest/tests/settings/test_settings_passcode.py
Adding back the change of test_settings_passcode.py
Merge pull request #932 from ypwalter/switch_to_keyboard

Change _switch_to_keyboard() to switch_to_keyboard()