Marked most m2 related bits as Unnecessary, as well as several other changes which do not need to be merged
Marked most m2 related bits as Unnecessary, as well as several other changes which do not need to be merged


git-svn-id: d69ffe4ccc4861bf06065bd0072b85c931fba7ed@431729 13f79535-47bb-0310-9956-ffa450edef68

apache/geronimo,apache/geronimo,apache/geronimo,apache/geronimo