Merge pull request #4 from owdqa/v1-train

V1 train
Merge pull request #33 from owdqa/v1-train

V1 train
Merge pull request #176 from roydude/v1-train

Removed merge conflict info from 26997
Merge pull request #177 from roydude/v1-train

Correction to 27036
Merge pull request #178 from roydude/v1-train

v1train
Merge pull request #179 from roydude/v1-train

v1train
Merge pull request #180 from roydude/v1-train

v1train
Merge pull request #181 from roydude/v1-train

v1train
Merge pull request #182 from roydude/v1-train

Made this quicker (sometimes it failed because it was taking too long).
Merge pull request #183 from roydude/v1-train

Blocks due to bug 901919
Merge pull request #184 from roydude/v1-train

Blocks due to bug 901931
Merge pull request #185 from roydude/v1-train

Blocked 27066
Merge pull request #186 from roydude/v1-train

v1train
Merge pull request #187 from roydude/v1-train

v1train
Merge pull request #188 from owdqa/v1-train

Rebase from v1train
Merge pull request #190 from owdqa/master

Master
Merge pull request #191 from roydude/v1-train

Unblocking and various tests.
Merge pull request #192 from roydude/v1-train

Trying to fix the problems cause by marionette session ending bug.
27064 done
Merge pull request #193 from b-paloma/v1-train

27064 done