NEXUS-5960: Killing remnants found by Alin
Cleanup
Cleanup @Component left over in comments

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Merge remote-tracking branch 'origin/master' into NEXUS-5953-remove-eventbus-managed