Merge proposals dependent on lp://staging/~adam-collard/landscape-charm/fix-landscape-readme

1. fix-landscape-readme
2. Dependent merge proposals