master
8257733: Move module-specific data from make to respective module
8285306: Fix typos in java.desktop