Merge "Change --screenshot-on-ui-failure to --screenshot-on-failure" into jb-mr2-dev