fix merge of lava-daemon branch
fix merge of lava-daemon branch

Change-Id: Icf41c860cc6eff21ba3b26ba01dba308bd7a4e90

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