Fix some co-installer bugs

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
De-complicate the co-installer

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>