1663 | Subhas/Kavitha | Refactor CouchDB settings handling and fix netbook-to-netbook sync