Merge proposals dependent on lp://staging/~michael.nelson/ubuntu-webcatalog/8133346-depend-on-rnr-client

1. 8133346-depend-on-rnr-client
2. Dependent merge proposals