GORA-321. Merge GORA_94 into Gora trunk

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