apply https://github.com/jbosstools/jbosstools-discovery/pull/55 and https://github.com/jbosstools/jbosstools-discovery/pull/56 in master >> master