am 639857f7: Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-mr2-dev

* commit '639857f7f42bb048b1dd8fbc4849e7b51402f629':
  Fix for bug 8607049: Improve javascript dialogs for classic