hg: jmc/jmc7: JMC-6629: jmc.product merge failure during jmc 7.1.0 branching

[guru.hb at oracle.com]

Changeset: 21e25b096933
Author:    ghb <guru.hb at oracle.com>
Date:      2019-11-11 23:03 +0530
URL:       https://hg.openjdk.java.net/jmc/jmc7/rev/21e25b096933

JMC-6629: jmc.product merge failure during jmc 7.1.0 branching
Reviewed-by: hirt

! application/org.openjdk.jmc.rcp.product/jmc.product