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