GERONIMO-6458 fix description of gerneric variables


git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/trunk@1621964 13f79535-47bb-0310-9956-ffa450edef68
GERONIMO-6458 move jcdi to java6 and upgrade parent pom to genesis 2.1


git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/trunk@1621966 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/trunk' into trunk