Refactor: clean up executeDoCommand
Also trigger screenshot-on-failure on a selenium exception
Merge branch 'master' into fastProcessor