Merge proposals dependent on lp://staging/~lukasz-czyzykowski/rnr-server/fix-404-in-rnr-client-tests

1. fix-404-in-rnr-client-tests
2. Dependent merge proposals