Clean backport of JDK-8366217. -------------
Commit messages: - Backport 613bbb146e42c0acb86b736e5097b33512841257 Changes: https://git.openjdk.org/jfx25u/pull/11/files Webrev: https://webrevs.openjdk.org/?repo=jfx25u&pr=11&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8366217 Stats: 18884 lines in 166 files changed: 14131 ins; 2041 del; 2712 mod Patch: https://git.openjdk.org/jfx25u/pull/11.diff Fetch: git fetch https://git.openjdk.org/jfx25u.git pull/11/head:pull/11 PR: https://git.openjdk.org/jfx25u/pull/11
