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