am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs

* commit '57394e3daff094c28ee2a2fb886e1764a1b7728d':
  Doc update: Refactoring to client/server.