FELIX-4164 Instance / Component matching regression * Tracks instances specifying the component's name OR the component's classname