Landscape Charm

Merge proposals dependent on lp://qastaging/~foli/landscape-charm/tools-fixes

  1. tools-fixes
  2. Dependent merge proposals

lp://qastaging/~foli/landscape-charm/tools-fixes has no merge proposals.