sync-monitor

Merge proposals dependent on lp://qastaging/~fboucault/sync-monitor/crossbuild_fixes

  1. crossbuild_fixes
  2. Dependent merge proposals

lp://qastaging/~fboucault/sync-monitor/crossbuild_fixes has no merge proposals.