Clean backport of JDK-8361648. -------------
Commit messages: - Backport f9532842b0765472c7490fb5bbf57cf268dd45ee Changes: https://git.openjdk.org/jfx25u/pull/4/files Webrev: https://webrevs.openjdk.org/?repo=jfx25u&pr=4&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8361648 Stats: 10129 lines in 100 files changed: 4473 ins; 1389 del; 4267 mod Patch: https://git.openjdk.org/jfx25u/pull/4.diff Fetch: git fetch https://git.openjdk.org/jfx25u.git pull/4/head:pull/4 PR: https://git.openjdk.org/jfx25u/pull/4
