Merge "Fix bug 7054190 line breaks at inappropriate places" into jb-mr1-dev