master
8281682: Redundant .ico files in Windows app-image cause unnecessary bloat
8252870: Finalize (remove "incubator" from) jpackage