Move reset timeout from global before to session before
Merge pull request #2198 from d0lfin/master

Move reset timeout from "global before" to "session before"
fix find-element test
-ios_uiautomation -> -ios uiautomation
accessibility_id -> accessibility id
Merge pull request #2203 from Jonahss/LocStratUnderscores

Loc strat underscores
update real device info
Merge remote-tracking branch 'upstream/master'
Fixed a lint error, and add test coverage.