Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs