Backports

Description

We have one sanity test failing on Windows + Linux and it is probably only luck that prevents it failing on other platforms :
sanity/client/SwingSet/src/ColorChooserDemoTest.java
There is an open bug on this : https://bugs.openjdk.java.net/browse/JDK-8221312 .

We have two others sanity test failing, one on Windows and one on Linux :