GORA-94v11 and GORA-246v5

git-svn-id: https://svn.apache.org/repos/asf/gora/branches/GORA_94@1572170 13f79535-47bb-0310-9956-ffa450edef68