--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java	Thu Jun 06 19:53:38 2019 -0400
@@ -301,7 +301,6 @@
         return appDir != null;
     }
 
-    //@Override
     public File bundle(Map<String, ? super Object> params,
             File outdir) throws PackagerException {
         if (!outdir.isDirectory() && !outdir.mkdirs()) {

--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java	Thu Jun 06 19:53:38 2019 -0400
@@ -430,7 +430,7 @@
                 }
 
                 String description = FA_DESCRIPTION.fetchFrom(assoc);
-                File faIcon = FA_ICON.fetchFrom(assoc); //TODO FA_ICON_PNG
+                File faIcon = FA_ICON.fetchFrom(assoc);
                 List<String> extensions = FA_EXTENSIONS.fetchFrom(assoc);
                 if (extensions == null) {
                     Log.verbose(I18N.getString(
@@ -585,7 +585,6 @@
         data.put("INSTALLATION_DIRECTORY", LINUX_INSTALL_DIR.fetchFrom(params));
         data.put("XDG_PREFIX", XDG_FILE_PREFIX.fetchFrom(params));
         data.put("DEPLOY_BUNDLE_CATEGORY", MENU_GROUP.fetchFrom(params));
-        // TODO rpm categories
         data.put("APPLICATION_DESCRIPTION", DESCRIPTION.fetchFrom(params));
         data.put("APPLICATION_SUMMARY", APP_NAME.fetchFrom(params));
         data.put("APPLICATION_LICENSE_TYPE", LICENSE_TYPE.fetchFrom(params));

--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -24,9 +24,9 @@
 #
 #
 app.bundler.name=Linux Application Image
-app.bundler.description=A Directory based image of a linux Application with an optionally co-bundled JRE.  Used as a base for the Installer bundlers.
+app.bundler.description=A Directory based image of a linux Application with an optionally co-bundled JRE. Used as a base for the Installer bundlers.
 deb.bundler.name=DEB Installer
-deb.bundler.description=Linux Debian Bundle.
+deb.bundler.description=Linux Debian Bundle
 rpm.bundler.name=RPM Bundle
 rpm.bundler.description=Redhat Package Manager (RPM) bundler.
 
@@ -39,40 +39,28 @@
 resource.deb-postinstall-script=DEB postinstall script
 resource.deb-postrm-script=DEB postrm script
 resource.deb-copyright-file=DEB copyright file
-resource.deb-init-script=DEB init script
 resource.menu-shortcut-descriptor=Menu shortcut descriptor
 resource.menu-icon=menu icon
 resource.rpm-spec-file=RPM spec file
-resource.rpm-init-script=RPM init script
 
 error.parameters-null=Parameters map is null.
 error.parameters-null.advice=Pass in a non-null parameters map.
-error.parameters-null=Parameters map is null.
-error.parameters-null.advice=Pass in a non-null parameters map.
 error.tool-not-found=Can not find {0}.
 error.tool-not-found.advice=Please install required packages.
-error.launcher-name-too-long=The bundle name "{0}" is too long for a daemon.
-error.launcher-name-too-long.advice=Set a bundler argument "{0}" to a bundle name that is shorter than 16 characters.
 error.cannot-create-output-dir=Output directory {0} cannot be created.
 error.cannot-write-to-output-dir=Output directory {0} is not writable.
 error.no-content-types-for-file-association=No MIME types were specified for File Association number {0}.
-error.no-content-types-for-file-association.advice=For Linux Bundling specify one and only one MIME type for each file association.
 error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}.
-error.too-many-content-types-for-file-association.advice=For Linux Bundling specify one and only one MIME type for each file association.
-error.no-support-for-peruser-daemons=Bundler doesn't support per-user daemons.
-error.no-support-for-peruser-daemons.advice=Make sure that the system wide hint is set to true.
 error.invalid-value-for-package-name=Invalid value "{0}" for the package name.
 error.invalid-value-for-package-name.advice=Set the "linux.bundleName" parameter to a valid Debian package name. Note that the package names must consist only of lower case letters (a-z), digits (0-9), plus (+) and minus (-) signs, and periods (.). They must be at least two characters long and must start with an alphanumeric character.
 error.cannot-find-rpmbuild=Can not find rpmbuild {0} or newer.
 error.cannot-find-rpmbuild.advice=\  Install packages needed to build RPM, version {0} or newer.
 
-
-message.icon-not-png=The specified icon "{0}" is not a PNG file and will not be used.  The default icon will be used in it's place.
+message.icon-not-png=The specified icon "{0}" is not a PNG file and will not be used. The default icon will be used in it's place.
 message.test-for-tool=Test for [{0}]. Result: {1}
 message.outputting-to-location=Generating DEB for installer to: {0}.
 message.output-to-location=Package (.deb) saved to: {0}.
-message.debs-like-licenses=Debian packages should specify a license.  The absence of a license will cause some linux distributions to complain about the quality of the application.
-message.one-shortcut-required=At least one type of shortcut is required. Enabling menu shortcut.
+message.debs-like-licenses=Debian packages should specify a license. The absence of a license will cause some linux distributions to complain about the quality of the application.
 message.outputting-bundle-location=Generating RPM for installer to: {0}.
 message.output-bundle-location=Package (.rpm) saved to: {0}.
 message.creating-association-with-null-extension=Creating association with null extension.

--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -24,9 +24,9 @@
 #
 #
 app.bundler.name=Linux Application Image
-app.bundler.description=A Directory based image of a linux Application with an optionally co-bundled JRE.  Used as a base for the Installer bundlers.
+app.bundler.description=A Directory based image of a linux Application with an optionally co-bundled JRE. Used as a base for the Installer bundlers.
 deb.bundler.name=DEB Installer
-deb.bundler.description=Linux Debian Bundle.
+deb.bundler.description=Linux Debian Bundle
 rpm.bundler.name=RPM Bundle
 rpm.bundler.description=Redhat Package Manager (RPM) bundler.
 
@@ -39,40 +39,28 @@
 resource.deb-postinstall-script=DEB postinstall script
 resource.deb-postrm-script=DEB postrm script
 resource.deb-copyright-file=DEB copyright file
-resource.deb-init-script=DEB init script
 resource.menu-shortcut-descriptor=Menu shortcut descriptor
 resource.menu-icon=menu icon
 resource.rpm-spec-file=RPM spec file
-resource.rpm-init-script=RPM init script
 
 error.parameters-null=Parameters map is null.
 error.parameters-null.advice=Pass in a non-null parameters map.
-error.parameters-null=Parameters map is null.
-error.parameters-null.advice=Pass in a non-null parameters map.
 error.tool-not-found=Can not find {0}.
 error.tool-not-found.advice=Please install required packages.
-error.launcher-name-too-long=The bundle name "{0}" is too long for a daemon.
-error.launcher-name-too-long.advice=Set a bundler argument "{0}" to a bundle name that is shorter than 16 characters.
 error.cannot-create-output-dir=Output directory {0} cannot be created.
 error.cannot-write-to-output-dir=Output directory {0} is not writable.
 error.no-content-types-for-file-association=No MIME types were specified for File Association number {0}.
-error.no-content-types-for-file-association.advice=For Linux Bundling specify one and only one MIME type for each file association.
 error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}.
-error.too-many-content-types-for-file-association.advice=For Linux Bundling specify one and only one MIME type for each file association.
-error.no-support-for-peruser-daemons=Bundler doesn't support per-user daemons.
-error.no-support-for-peruser-daemons.advice=Make sure that the system wide hint is set to true.
 error.invalid-value-for-package-name=Invalid value "{0}" for the package name.
 error.invalid-value-for-package-name.advice=Set the "linux.bundleName" parameter to a valid Debian package name. Note that the package names must consist only of lower case letters (a-z), digits (0-9), plus (+) and minus (-) signs, and periods (.). They must be at least two characters long and must start with an alphanumeric character.
 error.cannot-find-rpmbuild=Can not find rpmbuild {0} or newer.
 error.cannot-find-rpmbuild.advice=\  Install packages needed to build RPM, version {0} or newer.
 
-
-message.icon-not-png=The specified icon "{0}" is not a PNG file and will not be used.  The default icon will be used in it's place.
+message.icon-not-png=The specified icon "{0}" is not a PNG file and will not be used. The default icon will be used in it's place.
 message.test-for-tool=Test for [{0}]. Result: {1}
 message.outputting-to-location=Generating DEB for installer to: {0}.
 message.output-to-location=Package (.deb) saved to: {0}.
-message.debs-like-licenses=Debian packages should specify a license.  The absence of a license will cause some linux distributions to complain about the quality of the application.
-message.one-shortcut-required=At least one type of shortcut is required. Enabling menu shortcut.
+message.debs-like-licenses=Debian packages should specify a license. The absence of a license will cause some linux distributions to complain about the quality of the application.
 message.outputting-bundle-location=Generating RPM for installer to: {0}.
 message.output-bundle-location=Package (.rpm) saved to: {0}.
 message.creating-association-with-null-extension=Creating association with null extension.

--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -24,9 +24,9 @@
 #
 #
 app.bundler.name=Linux Application Image
-app.bundler.description=A Directory based image of a linux Application with an optionally co-bundled JRE.  Used as a base for the Installer bundlers.
+app.bundler.description=A Directory based image of a linux Application with an optionally co-bundled JRE. Used as a base for the Installer bundlers.
 deb.bundler.name=DEB Installer
-deb.bundler.description=Linux Debian Bundle.
+deb.bundler.description=Linux Debian Bundle
 rpm.bundler.name=RPM Bundle
 rpm.bundler.description=Redhat Package Manager (RPM) bundler.
 
@@ -39,40 +39,28 @@
 resource.deb-postinstall-script=DEB postinstall script
 resource.deb-postrm-script=DEB postrm script
 resource.deb-copyright-file=DEB copyright file
-resource.deb-init-script=DEB init script
 resource.menu-shortcut-descriptor=Menu shortcut descriptor
 resource.menu-icon=menu icon
 resource.rpm-spec-file=RPM spec file
-resource.rpm-init-script=RPM init script
 
 error.parameters-null=Parameters map is null.
 error.parameters-null.advice=Pass in a non-null parameters map.
-error.parameters-null=Parameters map is null.
-error.parameters-null.advice=Pass in a non-null parameters map.
 error.tool-not-found=Can not find {0}.
 error.tool-not-found.advice=Please install required packages.
-error.launcher-name-too-long=The bundle name "{0}" is too long for a daemon.
-error.launcher-name-too-long.advice=Set a bundler argument "{0}" to a bundle name that is shorter than 16 characters.
 error.cannot-create-output-dir=Output directory {0} cannot be created.
 error.cannot-write-to-output-dir=Output directory {0} is not writable.
 error.no-content-types-for-file-association=No MIME types were specified for File Association number {0}.
-error.no-content-types-for-file-association.advice=For Linux Bundling specify one and only one MIME type for each file association.
 error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}.
-error.too-many-content-types-for-file-association.advice=For Linux Bundling specify one and only one MIME type for each file association.
-error.no-support-for-peruser-daemons=Bundler doesn't support per-user daemons.
-error.no-support-for-peruser-daemons.advice=Make sure that the system wide hint is set to true.
 error.invalid-value-for-package-name=Invalid value "{0}" for the package name.
 error.invalid-value-for-package-name.advice=Set the "linux.bundleName" parameter to a valid Debian package name. Note that the package names must consist only of lower case letters (a-z), digits (0-9), plus (+) and minus (-) signs, and periods (.). They must be at least two characters long and must start with an alphanumeric character.
 error.cannot-find-rpmbuild=Can not find rpmbuild {0} or newer.
 error.cannot-find-rpmbuild.advice=\  Install packages needed to build RPM, version {0} or newer.
 
-
-message.icon-not-png=The specified icon "{0}" is not a PNG file and will not be used.  The default icon will be used in it's place.
+message.icon-not-png=The specified icon "{0}" is not a PNG file and will not be used. The default icon will be used in it's place.
 message.test-for-tool=Test for [{0}]. Result: {1}
 message.outputting-to-location=Generating DEB for installer to: {0}.
 message.output-to-location=Package (.deb) saved to: {0}.
-message.debs-like-licenses=Debian packages should specify a license.  The absence of a license will cause some linux distributions to complain about the quality of the application.
-message.one-shortcut-required=At least one type of shortcut is required. Enabling menu shortcut.
+message.debs-like-licenses=Debian packages should specify a license. The absence of a license will cause some linux distributions to complain about the quality of the application.
 message.outputting-bundle-location=Generating RPM for installer to: {0}.
 message.output-bundle-location=Package (.rpm) saved to: {0}.
 message.creating-association-with-null-extension=Creating association with null extension.

--- a/src/jdk.jpackage/linux/native/libapplauncher/LinuxPlatform.cpp	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/linux/native/libapplauncher/LinuxPlatform.cpp	Thu Jun 06 19:53:38 2019 -0400
@@ -861,15 +861,6 @@
          * TOKEN_EMPTY_CLOSE_BRACKET */
         GetNextToken();
 
-        /* Skip until '>', '/>' or EOF. This should really be an error, */
-        /* but we are loose */
-        //        if(CurTokenType == TOKEN_EMPTY_CLOSE_BRACKET ||
-        //               CurTokenType == TOKEN_CLOSE_BRACKET ||
-        //               CurTokenType  == TOKEN_EOF) {
-        //            println("XML Parsing error: wrong kind of token found");
-        //            return NULL;
-        //        }
-
         if (CurTokenType == TOKEN_EMPTY_CLOSE_BRACKET) {
             GetNextToken();
             /* We are done with the sublevel - fall through to continue */

--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java	Thu Jun 06 19:53:38 2019 -0400
@@ -579,7 +579,7 @@
                     + "." + ((extensions == null || extensions.isEmpty())
                     ? "mime" : extensions.get(0));
             String description = FA_DESCRIPTION.fetchFrom(fileAssociation);
-            File icon = FA_ICON.fetchFrom(fileAssociation); //TODO FA_ICON_ICNS
+            File icon = FA_ICON.fetchFrom(fileAssociation);
 
             bundleDocumentTypes.append("    <dict>\n")
                     .append("      <key>LSItemContentTypes</key>\n")

--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java	Thu Jun 06 19:53:38 2019 -0400
@@ -117,7 +117,6 @@
             params -> "-MacAppStore",
             (s, p) -> s);
 
-    //@Override
     public File bundle(Map<String, ? super Object> params,
             File outdir) throws PackagerException {
         Log.verbose(MessageFormat.format(I18N.getString(
@@ -314,8 +313,6 @@
             // availability.
             // run basic validation to ensure requirements are met
 
-            // TODO Mac App Store apps cannot use the system runtime
-
             // we are not interested in return code, only possible exception
             validateAppImageAndBundeler(params);
 

--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java	Thu Jun 06 19:53:38 2019 -0400
@@ -519,10 +519,8 @@
         results.addAll(MacAppBundler.getAppBundleParameters());
         results.addAll(Arrays.asList(
                 DEVELOPER_ID_INSTALLER_SIGNING_KEY,
-                // IDENTIFIER,
                 INSTALLER_SUFFIX,
                 LICENSE_FILE,
-                // SERVICE_HINT,
                 SIGNING_KEYCHAIN));
 
         return results;

--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -25,22 +25,18 @@
 #
 
 app.bundler.name=Mac Application Image
-app.bundler.description=A Directory based image of a mac Application with an optionally co-bundled JRE.  Used as a base for the Installer bundlers
+app.bundler.description=A Directory based image of a mac Application with an optionally co-bundled JRE. Used as a base for the Installer bundlers.
 store.bundler.name=Mac App Store Ready Bundler
 store.bundler.description=Creates a binary bundle ready for deployment into the Mac App Store.
 dmg.bundler.name=DMG Installer
 dmg.bundler.description=Mac DMG Installer Bundle
 pkg.bundler.name=PKG Installer
-pkg.bundler.description=Mac PKG Installer Bundle.
+pkg.bundler.description=Mac PKG Installer Bundle
 
 error.invalid-cfbundle-version=Invalid CFBundleVersion: [{0}].
-error.invalid-cfbundle-version.advice=Set a compatible 'appVersion' or set a 'mac.CFBundleVersion'.  Valid versions are one to three integers separated by dots.
+error.invalid-cfbundle-version.advice=Set a compatible 'appVersion' or set a 'mac.CFBundleVersion'. Valid versions are one to three integers separated by dots.
 error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate specified.
 error.explicit-sign-no-cert.advice=Either specify a valid cert in 'mac.signing-key-developer-id-app' or unset 'signBundle' or set 'signBundle' to false.
-error.non-existent-runtime=The file for the Runtime/JRE directory does not exist.
-error.non-existent-runtime.advice=Point the runtime parameter to a directory that containes the JRE.
-error.cannot-detect-runtime-in-directory=Cannot determine which JRE/JDK exists in the specified runtime directory.
-error.cannot-detect-runtime-in-directory.advice=Point the runtime directory to one of the JDK/JRE root, the Contents/Home directory of that root, or the Contents/Home/jre directory of the JDK.
 error.parameters-null=Parameters map is null.
 error.parameters-null.advice=Pass in a non-null parameters map.
 error.cannot-create-output-dir=Output directory {0} cannot be created.
@@ -52,8 +48,6 @@
 error.no-pkg-signing-key=No Mac App Store Installer Signing Key
 error.no-pkg-signing-key.advice=Install your app signing keys into your Mac Keychain using XCode.
 error.certificate.expired=Error: Certificate expired {0}.
-error.dmg-does-not-do-daemons=DMG bundler doesn't support services.
-error.dmg-does-not-do-daemons.advice=Make sure that the service hint is set to false.
 
 resource.bundle-config-file=Bundle config file
 resource.app-info-plist=Application Info.plist
@@ -70,10 +64,10 @@
 resource.pkg-background-image=pkg background image
 
 
-message.bundle-name-too-long-warning={0} is set to ''{1}'', which is longer than 16 characters.  For a better Mac experience consider shortening it.
+message.bundle-name-too-long-warning={0} is set to ''{1}'', which is longer than 16 characters. For a better Mac experience consider shortening it.
 message.null-classpath=Null app resources?
 message.preparing-info-plist=Preparing Info.plist: {0}.
-message.icon-not-icns= The specified icon "{0}" is not an ICNS file and will not be used.  The default icon will be used in it's place.
+message.icon-not-icns= The specified icon "{0}" is not an ICNS file and will not be used. The default icon will be used in it's place.
 message.version-string-too-many-components=Version sting may have between 1 and 3 numbers: 1, 1.2, 1.2.3.
 message.version-string-first-number-not-zero=The first number in a CFBundleVersion cannot be zero or negative.
 message.version-string-no-negative-numbers=Negative numbers are not allowed in version strings.
@@ -82,17 +76,14 @@
 message.ignoring.symlink=Warning: codesign is skipping the symlink {0}.
 message.keychain.error=Error: unable to get keychain list.
 message.building-bundle=Building Mac App Store Bundle for {0}.
-mesasge.intermediate-bundle-location=Intermediate application bundle image: {0}
 message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists.
 message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
-message.could-not-retrieve-name=Could not retrieve gecos name.
 message.app-image-requires-app-name=When using an external app image you must specify the app name.
 message.app-image-requires-app-name.advice=Set the app name via the -name CLI flag, the fx:application/@name ANT attribute, or via the 'appName' bundler argument.
 message.app-image-requires-identifier=When using an external app image you must specify the identifier.
 message.app-image-requires-identifier.advice=Set the identifier via the -appId CLI flag, the fx:application/@id ANT attribute, or via the 'identifier' bundler argument.
 message.building-dmg=Building DMG package for {0}.
 message.running-script=Running shell script on application image [{0}].
-message.intermediate-image-location=[DEBUG] Intermediate application bundle image: {0}.
 message.preparing-dmg-setup=Preparing dmg setup: {0}.
 message.creating-dmg-file=Creating DMG file: {0}.
 message.dmg-cannot-be-overwritten=Dmg file exists ({0} and can not be removed.

--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -25,22 +25,18 @@
 #
 
 app.bundler.name=Mac Application Image
-app.bundler.description=A Directory based image of a mac Application with an optionally co-bundled JRE.  Used as a base for the Installer bundlers
+app.bundler.description=A Directory based image of a mac Application with an optionally co-bundled JRE. Used as a base for the Installer bundlers.
 store.bundler.name=Mac App Store Ready Bundler
 store.bundler.description=Creates a binary bundle ready for deployment into the Mac App Store.
 dmg.bundler.name=DMG Installer
 dmg.bundler.description=Mac DMG Installer Bundle
 pkg.bundler.name=PKG Installer
-pkg.bundler.description=Mac PKG Installer Bundle.
+pkg.bundler.description=Mac PKG Installer Bundle
 
 error.invalid-cfbundle-version=Invalid CFBundleVersion: [{0}].
-error.invalid-cfbundle-version.advice=Set a compatible 'appVersion' or set a 'mac.CFBundleVersion'.  Valid versions are one to three integers separated by dots.
+error.invalid-cfbundle-version.advice=Set a compatible 'appVersion' or set a 'mac.CFBundleVersion'. Valid versions are one to three integers separated by dots.
 error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate specified.
 error.explicit-sign-no-cert.advice=Either specify a valid cert in 'mac.signing-key-developer-id-app' or unset 'signBundle' or set 'signBundle' to false.
-error.non-existent-runtime=The file for the Runtime/JRE directory does not exist.
-error.non-existent-runtime.advice=Point the runtime parameter to a directory that containes the JRE.
-error.cannot-detect-runtime-in-directory=Cannot determine which JRE/JDK exists in the specified runtime directory.
-error.cannot-detect-runtime-in-directory.advice=Point the runtime directory to one of the JDK/JRE root, the Contents/Home directory of that root, or the Contents/Home/jre directory of the JDK.
 error.parameters-null=Parameters map is null.
 error.parameters-null.advice=Pass in a non-null parameters map.
 error.cannot-create-output-dir=Output directory {0} cannot be created.
@@ -52,8 +48,6 @@
 error.no-pkg-signing-key=No Mac App Store Installer Signing Key
 error.no-pkg-signing-key.advice=Install your app signing keys into your Mac Keychain using XCode.
 error.certificate.expired=Error: Certificate expired {0}.
-error.dmg-does-not-do-daemons=DMG bundler doesn't support services.
-error.dmg-does-not-do-daemons.advice=Make sure that the service hint is set to false.
 
 resource.bundle-config-file=Bundle config file
 resource.app-info-plist=Application Info.plist
@@ -70,10 +64,10 @@
 resource.pkg-background-image=pkg background image
 
 
-message.bundle-name-too-long-warning={0} is set to ''{1}'', which is longer than 16 characters.  For a better Mac experience consider shortening it.
+message.bundle-name-too-long-warning={0} is set to ''{1}'', which is longer than 16 characters. For a better Mac experience consider shortening it.
 message.null-classpath=Null app resources?
 message.preparing-info-plist=Preparing Info.plist: {0}.
-message.icon-not-icns= The specified icon "{0}" is not an ICNS file and will not be used.  The default icon will be used in it's place.
+message.icon-not-icns= The specified icon "{0}" is not an ICNS file and will not be used. The default icon will be used in it's place.
 message.version-string-too-many-components=Version sting may have between 1 and 3 numbers: 1, 1.2, 1.2.3.
 message.version-string-first-number-not-zero=The first number in a CFBundleVersion cannot be zero or negative.
 message.version-string-no-negative-numbers=Negative numbers are not allowed in version strings.
@@ -82,17 +76,14 @@
 message.ignoring.symlink=Warning: codesign is skipping the symlink {0}.
 message.keychain.error=Error: unable to get keychain list.
 message.building-bundle=Building Mac App Store Bundle for {0}.
-mesasge.intermediate-bundle-location=Intermediate application bundle image: {0}
 message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists.
 message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
-message.could-not-retrieve-name=Could not retrieve gecos name.
 message.app-image-requires-app-name=When using an external app image you must specify the app name.
 message.app-image-requires-app-name.advice=Set the app name via the -name CLI flag, the fx:application/@name ANT attribute, or via the 'appName' bundler argument.
 message.app-image-requires-identifier=When using an external app image you must specify the identifier.
 message.app-image-requires-identifier.advice=Set the identifier via the -appId CLI flag, the fx:application/@id ANT attribute, or via the 'identifier' bundler argument.
 message.building-dmg=Building DMG package for {0}.
 message.running-script=Running shell script on application image [{0}].
-message.intermediate-image-location=[DEBUG] Intermediate application bundle image: {0}.
 message.preparing-dmg-setup=Preparing dmg setup: {0}.
 message.creating-dmg-file=Creating DMG file: {0}.
 message.dmg-cannot-be-overwritten=Dmg file exists ({0} and can not be removed.

--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -25,22 +25,18 @@
 #
 
 app.bundler.name=Mac Application Image
-app.bundler.description=A Directory based image of a mac Application with an optionally co-bundled JRE.  Used as a base for the Installer bundlers
+app.bundler.description=A Directory based image of a mac Application with an optionally co-bundled JRE. Used as a base for the Installer bundlers.
 store.bundler.name=Mac App Store Ready Bundler
 store.bundler.description=Creates a binary bundle ready for deployment into the Mac App Store.
 dmg.bundler.name=DMG Installer
 dmg.bundler.description=Mac DMG Installer Bundle
 pkg.bundler.name=PKG Installer
-pkg.bundler.description=Mac PKG Installer Bundle.
+pkg.bundler.description=Mac PKG Installer Bundle
 
 error.invalid-cfbundle-version=Invalid CFBundleVersion: [{0}].
-error.invalid-cfbundle-version.advice=Set a compatible 'appVersion' or set a 'mac.CFBundleVersion'.  Valid versions are one to three integers separated by dots.
+error.invalid-cfbundle-version.advice=Set a compatible 'appVersion' or set a 'mac.CFBundleVersion'. Valid versions are one to three integers separated by dots.
 error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate specified.
 error.explicit-sign-no-cert.advice=Either specify a valid cert in 'mac.signing-key-developer-id-app' or unset 'signBundle' or set 'signBundle' to false.
-error.non-existent-runtime=The file for the Runtime/JRE directory does not exist.
-error.non-existent-runtime.advice=Point the runtime parameter to a directory that containes the JRE.
-error.cannot-detect-runtime-in-directory=Cannot determine which JRE/JDK exists in the specified runtime directory.
-error.cannot-detect-runtime-in-directory.advice=Point the runtime directory to one of the JDK/JRE root, the Contents/Home directory of that root, or the Contents/Home/jre directory of the JDK.
 error.parameters-null=Parameters map is null.
 error.parameters-null.advice=Pass in a non-null parameters map.
 error.cannot-create-output-dir=Output directory {0} cannot be created.
@@ -52,8 +48,6 @@
 error.no-pkg-signing-key=No Mac App Store Installer Signing Key
 error.no-pkg-signing-key.advice=Install your app signing keys into your Mac Keychain using XCode.
 error.certificate.expired=Error: Certificate expired {0}.
-error.dmg-does-not-do-daemons=DMG bundler doesn't support services.
-error.dmg-does-not-do-daemons.advice=Make sure that the service hint is set to false.
 
 resource.bundle-config-file=Bundle config file
 resource.app-info-plist=Application Info.plist
@@ -70,10 +64,10 @@
 resource.pkg-background-image=pkg background image
 
 
-message.bundle-name-too-long-warning={0} is set to ''{1}'', which is longer than 16 characters.  For a better Mac experience consider shortening it.
+message.bundle-name-too-long-warning={0} is set to ''{1}'', which is longer than 16 characters. For a better Mac experience consider shortening it.
 message.null-classpath=Null app resources?
 message.preparing-info-plist=Preparing Info.plist: {0}.
-message.icon-not-icns= The specified icon "{0}" is not an ICNS file and will not be used.  The default icon will be used in it's place.
+message.icon-not-icns= The specified icon "{0}" is not an ICNS file and will not be used. The default icon will be used in it's place.
 message.version-string-too-many-components=Version sting may have between 1 and 3 numbers: 1, 1.2, 1.2.3.
 message.version-string-first-number-not-zero=The first number in a CFBundleVersion cannot be zero or negative.
 message.version-string-no-negative-numbers=Negative numbers are not allowed in version strings.
@@ -82,17 +76,14 @@
 message.ignoring.symlink=Warning: codesign is skipping the symlink {0}.
 message.keychain.error=Error: unable to get keychain list.
 message.building-bundle=Building Mac App Store Bundle for {0}.
-mesasge.intermediate-bundle-location=Intermediate application bundle image: {0}
 message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists.
 message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
-message.could-not-retrieve-name=Could not retrieve gecos name.
 message.app-image-requires-app-name=When using an external app image you must specify the app name.
 message.app-image-requires-app-name.advice=Set the app name via the -name CLI flag, the fx:application/@name ANT attribute, or via the 'appName' bundler argument.
 message.app-image-requires-identifier=When using an external app image you must specify the identifier.
 message.app-image-requires-identifier.advice=Set the identifier via the -appId CLI flag, the fx:application/@id ANT attribute, or via the 'identifier' bundler argument.
 message.building-dmg=Building DMG package for {0}.
 message.running-script=Running shell script on application image [{0}].
-message.intermediate-image-location=[DEBUG] Intermediate application bundle image: {0}.
 message.preparing-dmg-setup=Preparing dmg setup: {0}.
 message.creating-dmg-file=Creating DMG file: {0}.
 message.dmg-cannot-be-overwritten=Dmg file exists ({0} and can not be removed.

--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -41,10 +41,10 @@
 \        jpackage create-app-image -o outputdir -n name \\\n\
 \            -p modulePath -m moduleName/className\n\
 \        To provide your own options to jlink, run jlink separately:\n\
-\            jlink --output appRuntimeImage -p ModulePath -m moduleName\\\n\
+\            jlink --output appRuntimeImage -p ModulePath -m moduleName \\\n\
 \                --no-header-files [<additional jlink options>...]\n\
-\            jpackage create-app-image -o outputdir -n name\\\n\
-\                -m moduleName/className --runtime-image appRuntimeIMage\n\
+\            jpackage create-app-image -o outputdir -n name \\\n\
+\                -m moduleName/className --runtime-image appRuntimeImage\n\
 \    Generate an application installer:\n\
 \        jpackage create-installer -o outputdir -n name \\\n\
 \            -p modulePath -m moduleName/className\n\

--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -41,10 +41,10 @@
 \        jpackage create-app-image -o outputdir -n name \\\n\
 \            -p modulePath -m moduleName/className\n\
 \        To provide your own options to jlink, run jlink separately:\n\
-\            jlink --output appRuntimeImage -p ModulePath -m moduleName\\\n\
+\            jlink --output appRuntimeImage -p ModulePath -m moduleName \\\n\
 \                --no-header-files [<additional jlink options>...]\n\
-\            jpackage create-app-image -o outputdir -n name\\\n\
-\                -m moduleName/className --runtime-image appRuntimeIMage\n\
+\            jpackage create-app-image -o outputdir -n name \\\n\
+\                -m moduleName/className --runtime-image appRuntimeImage\n\
 \    Generate an application installer:\n\
 \        jpackage create-installer -o outputdir -n name \\\n\
 \            -p modulePath -m moduleName/className\n\

--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -41,10 +41,10 @@
 \        jpackage create-app-image -o outputdir -n name \\\n\
 \            -p modulePath -m moduleName/className\n\
 \        To provide your own options to jlink, run jlink separately:\n\
-\            jlink --output appRuntimeImage -p ModulePath -m moduleName\\\n\
+\            jlink --output appRuntimeImage -p ModulePath -m moduleName \\\n\
 \                --no-header-files [<additional jlink options>...]\n\
-\            jpackage create-app-image -o outputdir -n name\\\n\
-\                -m moduleName/className --runtime-image appRuntimeIMage\n\
+\            jpackage create-app-image -o outputdir -n name \\\n\
+\                -m moduleName/className --runtime-image appRuntimeImage\n\
 \    Generate an application installer:\n\
 \        jpackage create-installer -o outputdir -n name \\\n\
 \            -p modulePath -m moduleName/className\n\

--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -24,7 +24,6 @@
 #
 #
 
-param.category.default=Unknown
 param.copyright.default=Copyright (C) {0,date,YYYY}
 param.description.default=none
 param.vendor.default=Unknown
@@ -54,7 +53,6 @@
 
 warning.module.does.not.exist=Module [{0}] does not exist.
 warning.no.jdk.modules.found=Warning: No JDK Modules found.
-warning.missing.arg.file=Warning: Missing argument file: {0}.
 
 MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a bundle.
 MSG_BundlerPlatformException=Bundler {0} skipped because the bundler does not support bundling on this platform.
@@ -74,7 +72,6 @@
 ERR_MissingArgument=Error: Missing argument: {0}.
 ERR_MissingAppResources=Error: No application jars found.
 ERR_AppImageNotExist=Error: App image directory "{0}" does not exist.
-ERR_AppImageInvalid=Error: App image directory "{0}" does not contain "app" sub-directory.
 ERR_NoAddLauncherName=Error: --add-launcher option requires a name and a file path (--add-launcher <name>=<file path>).
 ERR_NoUniqueName=Error: --add-launcher <name>=<file path> requires a unique name.
 ERR_NoJreInstallerName=Error: Jre Installers require a name parameter.

--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -24,7 +24,6 @@
 #
 #
 
-param.category.default=Unknown
 param.copyright.default=Copyright (C) {0,date,YYYY}
 param.description.default=none
 param.vendor.default=Unknown
@@ -54,7 +53,6 @@
 
 warning.module.does.not.exist=Module [{0}] does not exist.
 warning.no.jdk.modules.found=Warning: No JDK Modules found.
-warning.missing.arg.file=Warning: Missing argument file: {0}.
 
 MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a bundle.
 MSG_BundlerPlatformException=Bundler {0} skipped because the bundler does not support bundling on this platform.
@@ -74,7 +72,6 @@
 ERR_MissingArgument=Error: Missing argument: {0}.
 ERR_MissingAppResources=Error: No application jars found.
 ERR_AppImageNotExist=Error: App image directory "{0}" does not exist.
-ERR_AppImageInvalid=Error: App image directory "{0}" does not contain "app" sub-directory.
 ERR_NoAddLauncherName=Error: --add-launcher option requires a name and a file path (--add-launcher <name>=<file path>).
 ERR_NoUniqueName=Error: --add-launcher <name>=<file path> requires a unique name.
 ERR_NoJreInstallerName=Error: Jre Installers require a name parameter.

--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -24,7 +24,6 @@
 #
 #
 
-param.category.default=Unknown
 param.copyright.default=Copyright (C) {0,date,YYYY}
 param.description.default=none
 param.vendor.default=Unknown
@@ -54,7 +53,6 @@
 
 warning.module.does.not.exist=Module [{0}] does not exist.
 warning.no.jdk.modules.found=Warning: No JDK Modules found.
-warning.missing.arg.file=Warning: Missing argument file: {0}.
 
 MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a bundle.
 MSG_BundlerPlatformException=Bundler {0} skipped because the bundler does not support bundling on this platform.
@@ -74,7 +72,6 @@
 ERR_MissingArgument=Error: Missing argument: {0}.
 ERR_MissingAppResources=Error: No application jars found.
 ERR_AppImageNotExist=Error: App image directory "{0}" does not exist.
-ERR_AppImageInvalid=Error: App image directory "{0}" does not contain "app" sub-directory.
 ERR_NoAddLauncherName=Error: --add-launcher option requires a name and a file path (--add-launcher <name>=<file path>).
 ERR_NoUniqueName=Error: --add-launcher <name>=<file path> requires a unique name.
 ERR_NoJreInstallerName=Error: Jre Installers require a name parameter.

--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java	Thu Jun 06 19:53:38 2019 -0400
@@ -321,7 +321,7 @@
                 FILE_ASSOCIATIONS.fetchFrom(params);
 
         for (Map<String, ? super Object> fa : fileAssociations) {
-            File icon = FA_ICON.fetchFrom(fa); // TODO FA_ICON_ICO
+            File icon = FA_ICON.fetchFrom(fa);
             if (icon == null) {
                 continue;
             }
@@ -556,7 +556,7 @@
         for (int i = 0; i < fetchFrom.size(); i++) {
             Map<String, ? super Object> fileAssociation = fetchFrom.get(i);
             String description = FA_DESCRIPTION.fetchFrom(fileAssociation);
-            File icon = FA_ICON.fetchFrom(fileAssociation); //TODO FA_ICON_ICO
+            File icon = FA_ICON.fetchFrom(fileAssociation);
 
             List<String> extensions = FA_EXTENSIONS.fetchFrom(fileAssociation);
             String entryName = regName + "File";

--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java	Thu Jun 06 19:53:38 2019 -0400
@@ -410,7 +410,7 @@
         List<Map<String, ? super Object>> fileAssociations =
                 FILE_ASSOCIATIONS.fetchFrom(params);
         for (Map<String, ? super Object> fa : fileAssociations) {
-            File icon = FA_ICON.fetchFrom(fa); // TODO FA_ICON_ICO
+            File icon = FA_ICON.fetchFrom(fa);
             if (icon == null) {
                 continue;
             }
@@ -859,7 +859,7 @@
                 String description = FA_DESCRIPTION.fetchFrom(fa);
                 List<String> extensions = FA_EXTENSIONS.fetchFrom(fa);
                 List<String> mimeTypes = FA_CONTENT_TYPE.fetchFrom(fa);
-                File icon = FA_ICON.fetchFrom(fa); // TODO FA_ICON_ICO
+                File icon = FA_ICON.fetchFrom(fa);
 
                 String mime = (mimeTypes == null ||
                     mimeTypes.isEmpty()) ? null : mimeTypes.get(0);

--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java	Thu Jun 06 19:53:38 2019 -0400
@@ -285,7 +285,6 @@
         }
     }
 
-    // TODO: do we still need this?
     private boolean copyMSVCDLLs(String VS_VER) throws IOException {
         final InputStream REDIST_MSVCR_URL = getResourceAsStream(
                 REDIST_MSVCR.replaceAll("VS_VER", VS_VER));

--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -25,7 +25,7 @@
 #
 
 app.bundler.name=Windows Application Image
-app.bundler.description=A Directory based image of a windows Application with an optionally co-bundled JRE.  Used as a base for the Installer bundlers
+app.bundler.description=A Directory based image of a windows Application with an optionally co-bundled JRE. Used as a base for the Installer bundlers.
 exe.bundler.name=EXE Installer
 exe.bundler.description=Microsoft Windows EXE Installer, via InnoIDE.
 msi.bundler.name=MSI Installer
@@ -33,7 +33,6 @@
 
 param.menu-group.default=Unknown
 
-resource.application-icon=application icon
 resource.executable-properties-template=Template for creating executable properties file.
 resource.inno-setup-project-file=Inno Setup project file
 resource.setup-icon=setup dialog icon
@@ -51,8 +50,6 @@
 error.iscc-not-found.advice=Download Inno Setup 5 or later from http://www.jrsoftware.org and add it to the PATH.
 error.copyright-is-too-long=The copyright string is too long for InnoSetup.
 error.copyright-is-too-long.advice=Provide a copyright string shorter than 100 characters.
-error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}.
-error.too-many-content-types-for-file-association.advice=Specify one and only one MIME type for each file association.
 error.no-wix-tools=Can not find WiX tools (light.exe, candle.exe).
 error.no-wix-tools.advice=Download WiX 3.0 or later from http://wix.sf.net and add it to the PATH.
 error.version-string-wrong-format=Version string is not compatible with MSI rules [{0}].
@@ -65,8 +62,8 @@
 error.version-swap=Failed to update version information for {0}.
 
 message.result-dir=Result application bundle: {0}.
-message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used.  The default icon will be used in it's place.
-message.multiple-launchers=Multiple launchers found in predefined app-image.  {0} will be used as primary launcher.
+message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used. The default icon will be used in it's place.
+message.multiple-launchers=Multiple launchers found in predefined app-image. {0} will be used as primary launcher.
 message.potential.windows.defender.issue=Warning: Windows Defender may prevent jpackage from functioning. If there is an issue, it can be addressed by either disabling realtime monitoring, or adding an exclusion for the directory "{0}".
 message.tool-wrong-version=Detected [{0}] version {1} but version {2} is required.
 message.outputting-to-location=Generating EXE for installer to: {0}.

--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -25,7 +25,7 @@
 #
 
 app.bundler.name=Windows Application Image
-app.bundler.description=A Directory based image of a windows Application with an optionally co-bundled JRE.  Used as a base for the Installer bundlers
+app.bundler.description=A Directory based image of a windows Application with an optionally co-bundled JRE. Used as a base for the Installer bundlers.
 exe.bundler.name=EXE Installer
 exe.bundler.description=Microsoft Windows EXE Installer, via InnoIDE.
 msi.bundler.name=MSI Installer
@@ -33,7 +33,6 @@
 
 param.menu-group.default=Unknown
 
-resource.application-icon=application icon
 resource.executable-properties-template=Template for creating executable properties file.
 resource.inno-setup-project-file=Inno Setup project file
 resource.setup-icon=setup dialog icon
@@ -51,8 +50,6 @@
 error.iscc-not-found.advice=Download Inno Setup 5 or later from http://www.jrsoftware.org and add it to the PATH.
 error.copyright-is-too-long=The copyright string is too long for InnoSetup.
 error.copyright-is-too-long.advice=Provide a copyright string shorter than 100 characters.
-error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}.
-error.too-many-content-types-for-file-association.advice=Specify one and only one MIME type for each file association.
 error.no-wix-tools=Can not find WiX tools (light.exe, candle.exe).
 error.no-wix-tools.advice=Download WiX 3.0 or later from http://wix.sf.net and add it to the PATH.
 error.version-string-wrong-format=Version string is not compatible with MSI rules [{0}].
@@ -65,8 +62,8 @@
 error.version-swap=Failed to update version information for {0}.
 
 message.result-dir=Result application bundle: {0}.
-message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used.  The default icon will be used in it's place.
-message.multiple-launchers=Multiple launchers found in predefined app-image.  {0} will be used as primary launcher.
+message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used. The default icon will be used in it's place.
+message.multiple-launchers=Multiple launchers found in predefined app-image. {0} will be used as primary launcher.
 message.potential.windows.defender.issue=Warning: Windows Defender may prevent jpackage from functioning. If there is an issue, it can be addressed by either disabling realtime monitoring, or adding an exclusion for the directory "{0}".
 message.tool-wrong-version=Detected [{0}] version {1} but version {2} is required.
 message.outputting-to-location=Generating EXE for installer to: {0}.

--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties	Thu Jun 06 19:53:38 2019 -0400
@@ -25,7 +25,7 @@
 #
 
 app.bundler.name=Windows Application Image
-app.bundler.description=A Directory based image of a windows Application with an optionally co-bundled JRE.  Used as a base for the Installer bundlers
+app.bundler.description=A Directory based image of a windows Application with an optionally co-bundled JRE. Used as a base for the Installer bundlers.
 exe.bundler.name=EXE Installer
 exe.bundler.description=Microsoft Windows EXE Installer, via InnoIDE.
 msi.bundler.name=MSI Installer
@@ -33,7 +33,6 @@
 
 param.menu-group.default=Unknown
 
-resource.application-icon=application icon
 resource.executable-properties-template=Template for creating executable properties file.
 resource.inno-setup-project-file=Inno Setup project file
 resource.setup-icon=setup dialog icon
@@ -51,8 +50,6 @@
 error.iscc-not-found.advice=Download Inno Setup 5 or later from http://www.jrsoftware.org and add it to the PATH.
 error.copyright-is-too-long=The copyright string is too long for InnoSetup.
 error.copyright-is-too-long.advice=Provide a copyright string shorter than 100 characters.
-error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}.
-error.too-many-content-types-for-file-association.advice=Specify one and only one MIME type for each file association.
 error.no-wix-tools=Can not find WiX tools (light.exe, candle.exe).
 error.no-wix-tools.advice=Download WiX 3.0 or later from http://wix.sf.net and add it to the PATH.
 error.version-string-wrong-format=Version string is not compatible with MSI rules [{0}].
@@ -65,8 +62,8 @@
 error.version-swap=Failed to update version information for {0}.
 
 message.result-dir=Result application bundle: {0}.
-message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used.  The default icon will be used in it's place.
-message.multiple-launchers=Multiple launchers found in predefined app-image.  {0} will be used as primary launcher.
+message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used. The default icon will be used in it's place.
+message.multiple-launchers=Multiple launchers found in predefined app-image. {0} will be used as primary launcher.
 message.potential.windows.defender.issue=Warning: Windows Defender may prevent jpackage from functioning. If there is an issue, it can be addressed by either disabling realtime monitoring, or adding an exclusion for the directory "{0}".
 message.tool-wrong-version=Detected [{0}] version {1} but version {2} is required.
 message.outputting-to-location=Generating EXE for installer to: {0}.

--- a/src/jdk.jpackage/windows/native/libapplauncher/FileAttribute.h	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/windows/native/libapplauncher/FileAttribute.h	Thu Jun 06 19:53:38 2019 -0400
@@ -33,10 +33,8 @@
     faDirectory = FILE_ATTRIBUTE_DIRECTORY,
     faEncrypted = FILE_ATTRIBUTE_ENCRYPTED,
     faHidden = FILE_ATTRIBUTE_HIDDEN,
-    //faIntegrityStream = FILE_ATTRIBUTE_INTEGRITY_STREAM,
     faNormal = FILE_ATTRIBUTE_NORMAL,
     faNotContentIndexed = FILE_ATTRIBUTE_NOT_CONTENT_INDEXED,
-    //faNoScrubData = FILE_ATTRIBUTE_NO_SCRUB_DATA,
     faOffline = FILE_ATTRIBUTE_OFFLINE,
     faSystem = FILE_ATTRIBUTE_SYSTEM,
     faSymbolicLink = FILE_ATTRIBUTE_REPARSE_POINT,

--- a/src/jdk.jpackage/windows/native/libapplauncher/FilePath.cpp	Thu Jun 06 19:51:17 2019 -0400
+++ b/src/jdk.jpackage/windows/native/libapplauncher/FilePath.cpp	Thu Jun 06 19:53:38 2019 -0400
@@ -386,18 +386,12 @@
         if (attributes | FILE_ATTRIBUTE_HIDDEN) {
             FAttributes.push_back(faHidden);
         }
-        // if (attributes | FILE_ATTRIBUTE_INTEGRITY_STREAM) {
-        //     FAttributes.push_back(faIntegrityStream);
-        // }
         if (attributes | FILE_ATTRIBUTE_NORMAL) {
             FAttributes.push_back(faNormal);
         }
         if (attributes | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED) {
             FAttributes.push_back(faNotContentIndexed);
         }
-        // if (attributes | FILE_ATTRIBUTE_NO_SCRUB_DATA) {
-        //     FAttributes.push_back(faNoScrubData);
-        // }
         if (attributes | FILE_ATTRIBUTE_SYSTEM) {
             FAttributes.push_back(faSystem);
         }