Merge proposals dependent on lp://qastaging/~xnox/xdiagnose/py3port

lp://qastaging/~xnox/xdiagnose/py3port has no merge proposals.