GERONIMO-6489 upgrade to genesis 2.1 and fix formatting

The old genesis-java6-flava 2.0 had a felix bundle plugin 2.0 which
caused a serious error during deployment.


git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/trunk@1544176 13f79535-47bb-0310-9956-ffa450edef68