GORA-94 patch v7 commit. 2 failing tests remaining

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