Removing a redundant private utility method
Fixing diagnostics if -role option value is not specified
Fixing javadoc about setting CapabilityMatcher
Code cleanup