Merge proposals dependent on lp://staging/~dpb/landscape-buildout-dependencies/landscape-buildout-dependencies-2

1. landscape-buildout-dependencies-2
2. Dependent merge proposals