Fix issue with server tests and new combined controls.

Client and server control files for combined jobs are subtly different.

BUG=chromium-os:22271
TEST=Ran run_remote_tests.

Change-Id: I91dede0d0d35848d058991f65bf9ed55f2d4acc3
Reviewed-on: https://gerrit.chromium.org/gerrit/10881
Reviewed-by: Sam Leffler <sleffler@chromium.org>
Tested-by: Sam Leffler <sleffler@chromium.org>
Commit-Ready: Dale Curtis <dalecurtis@chromium.org>
Tested-by: Dale Curtis <dalecurtis@chromium.org>
1 file changed