Merge proposals dependent on lp://staging/~jseutter/landscape-client/better-config-handling

lp://staging/~jseutter/landscape-client/better-config-handling has no merge proposals.