RFR(S): 8168019: Resolve conflict in tests scripts after merge hs-comp to hs

[Tatiana Pivovarova]

Hello!

Please review this patch

Summary:
There were some conflicts during the merging hs and hs-comp caused by 
JDK-8166626 and JDK-8166399.
This patch unites these two changes in one.

Test:
on local machine run rbt with '--print json' for related jobs

bug: https://bugs.openjdk.java.net/browse/JDK-8168019
webrev: http://cr.openjdk.java.net/~tpivovarova/8168019/webrev.00/

--
Thanks,
Tatiana

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/hotspot-compiler-dev/attachments/20161019/f94308f7/attachment.html>