Merge proposals dependent on lp://staging/~ack/landscape-client/landscape-config-no-reregister-by-default

1. landscape-config-no-reregister-by-default
2. Dependent merge proposals