Merge 'jetbrains-master-mirror' into studio-master-dev

This adds upstream's latest changes from branch 884, see
https://github.com/JetBrains/jdk8u_nashorn/compare/736...884