Merge proposals dependent on lp://staging/~kamyanskiy/selenium-simple-test/selenium-grid-on-jenkinds

1. selenium-grid-on-jenkinds
2. Dependent merge proposals