RFR: 8221569: JFR tool produces incorrect output when both --categories and --events are specified

[Erik Gahlin]

Hi,

Could I have a review of a fix that makes sure the --events and 
-categories options can be used at the same time in the jfr tool. The 
fix also improves the error message if a user mistakenly types --event 
or --category.

Webrev:
http://cr.openjdk.java.net/~egahlin/8221569/

Bug:
https://bugs.openjdk.java.net/browse/JDK-8221569

Testing:
Tests in test/jdk/jdk/jfr

Thanks
Erik