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

* commit '46dedde94e24d9b0785dc68f19fdf71eff68e631':
  Fix for bug 8607049: Improve javascript dialogs for classic