Merge proposals dependent on lp://qastaging/~x2go/x2go/pyhoca-cli_build-baikal

lp://qastaging/~x2go/x2go/pyhoca-cli_build-baikal has no merge proposals.