Fix GERONIMO-5842 and GERONIMO-6480

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