merge license & notice changes (and fix slf4j name)

git-svn-id: https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/trunk@1362990 13f79535-47bb-0310-9956-ffa450edef68
10 files changed