Merge proposals dependent on lp://qastaging/~tspindler/serverguide/serverguide-review-multiarch-ts

1. serverguide-review-multiarch-ts
2. Dependent merge proposals