Merge proposals dependent on lp://staging/~x2go/x2go/pyhoca-cli_master

lp://staging/~x2go/x2go/pyhoca-cli_master has no merge proposals.