RFR: JDK-8229750: Fix bad merge of JDK-8215447 patch

[Alexander Matveev]

Looks good.

On 8/14/2019 11:29 AM, Alexey Semenyuk wrote:
> Please review the jpackage fix for bug [1] at [2].
>
> This is a fix for the JDK-8200758-branch branch of the open sandbox 
> repository (jpackage).
>
> - bad merge fix
>
> [1] https://bugs.openjdk.java.net/browse/JDK-8229750
>
> [2] http://cr.openjdk.java.net/~asemenyuk/8229750/webrev.00/
>
> Thanks,
> Alexey
>