Fix bug #1238578 and 1238581.
Fix bug #1238578 and 1238581.

Following are fixed:

-  lava-server unable to download definition as text file
-  unable to resubmit singlenode jobs on staging

This was introduced due to an error in merge conflict resolution on a
previous patchset.

Change-Id: Iba8e1090587678c54150add6d745ebeedcebd7e8

Linaro/lava-server,OSSystems/lava-server,Linaro/lava-server,OSSystems/lava-server,Linaro/lava-server,OSSystems/lava-server,Linaro/lava-server