Merge proposals dependent on lp://staging/~ahasenack/awstrial/x2go

lp://staging/~ahasenack/awstrial/x2go has no merge proposals.