After applying the fix for JDK-8145094, the bundle names are prefect.
But the .xml file names are still missing "-".

for example:
/net/scanas416.us.oracle.com/export/java_re/jdk/9/ea/RE/99_2015-12-22-0626_4138/bundles/windows-x86
  9ea+99.xml au-descriptor-9ea+99.xml

/net/scanas416.us.oracle.com/export/java_re/jdk/9/ea/RE/99_2015-12-22-0626_4138/bundles/osx-x64
 mac-9ea+99.xml

Build logs:
http://release-jdk9.us.oracle.com:8080/hudson/job/9-2-build-windows-i586-cygwin-phase2/668/console
http://release-jdk9.us.oracle.com:8080/hudson/job/9-2-build-macosx-x86_64-phase2/645/console