merge rev 727474(GERONIMO-4471), rev 727065 (GERONIMO-4461 GERONIMO-4466) from branch 2.1

git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk@727489 13f79535-47bb-0310-9956-ffa450edef68
3 files changed
tree: a477a0860d64a0e29118a9b932944538ab1e012f
  1. geronimo-connector/
  2. geronimo-transaction/
  3. pom.xml