NEXUS-5755: Few more
Merge branch 'NEXUS-5755-kill-plexus-simple-components' into NEXUS-5755-kill-plexus-from-cfg