Merge branch 'master', remote-tracking branch 'mozilla/master'
Merge branch 'failures'
Merge remote branch 'upstream/master'
pin versions
fix versions
Merge remote branch 'upstream/master'
Updated requirements for pytest-mozwebqa 0.8 and dependencies.
Removed rdflib from requirements.
Use the timeout value from pytest-mozwebqa instead of hard-coded values.
Merge branch 'master' into use-timeout
Updated README - removed Java/Grid dependencies.
Merge pull request #117 from davehunt/use-timeout

Use plugin timeout instead of hard-coded values
Merge pull request #118 from davehunt/update-readme

Updated README - removed Java/Grid dependencies
Fixed the link to the mozwebqa-test-templates
cast count to int, update remaining count due to functional change
Merge pull request #119 from zacc/update_char_count

Functional change to remaining char count
add xfail
Merge pull request #121 from zacc/xfail_fx_feedback_displayed

Add xfail to test
Xfail tests
Merge pull request #122 from bebef1987/fix_locales

Add xfail for locales test