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

* commit '38bdf107ba0abcce8b87bc87653c73191566d002':
  Doc update: Refactoring to client/server.