clean backport -------------
Commit messages: - Backport 15c50c20b80a9287d5b136a197454eabac604a34 Changes: https://git.openjdk.org/jfx25u/pull/12/files Webrev: https://webrevs.openjdk.org/?repo=jfx25u&pr=12&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8361893 Stats: 50107 lines in 105 files changed: 12675 ins; 16590 del; 20842 mod Patch: https://git.openjdk.org/jfx25u/pull/12.diff Fetch: git fetch https://git.openjdk.org/jfx25u.git pull/12/head:pull/12 PR: https://git.openjdk.org/jfx25u/pull/12