Merge proposals dependent on lp://qastaging/~ci-train-bot/qtorganizer5-eds/qtorganizer5-eds-ubuntu-yakkety-landing-073

1. qtorganizer5-eds-ubuntu-yakkety-landing-073
2. Dependent merge proposals