merge fixes from ../image-status-view-2
merge fixes from ../image-status-view-2

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