RFR: JMC-6629: jmc.product merge failure during jmc 7.1.0 branching

[Guru]

Hi All,

Please review the fix for 
JBS : https://bugs.openjdk.java.net/browse/JMC-6629 <https://bugs.openjdk.java.net/browse/JMC-6629>
Web rev : http://cr.openjdk.java.net/~ghb/JMC-6629/webrev.0/ <http://cr.openjdk.java.net/~ghb/JMC-6629/webrev.0/>
Solution : jmc.product wasn’t merged correctly during jmc to jmc7 (mercurial merge while resolving JMC-6601). 

Thanks,
Guru