Merge remote-tracking branch 'origin/master' into NEXUS-5755-kill-plexus-simple-components

Conflicts:
	plugins/basic/nexus-timeline-plugin/src/test/java/org/sonatype/nexus/events/NexusAuthenticationEventInspectorTest.java
Merge branch 'NEXUS-5755-kill-plexus-simple-components' into NEXUS-5755-kill-plexus-from-cfg

Conflicts:
	plugins/basic/nexus-timeline-plugin/src/test/java/org/sonatype/nexus/events/NexusAuthenticationEventInspectorTest.java