am fb45dbeb: am 748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev

* commit 'fb45dbeb216f513905e3c2bb7a86da6558862f42':
  Doc change: New class on avoiding save conflicts