Merge proposals dependent on lp://staging/~tealeg/landscape-client/allow-duplicate-keys-in-config

1. allow-duplicate-keys-in-config
2. Dependent merge proposals