JBIDE-17033 - ensure fsw6 is correctly detected