updating license information in headers in preparation for release
NXCM-5237 - Release 2.5
Merge remote-tracking branch 'origin/master' into NXCM-4361-salt-rework

Conflicts:
	security-realms/security-xml-realm/src/main/java/org/sonatype/security/realms/tools/Sha1ThenMd5CredentialsMatcher.java