GORA-245. Fixing failing test and adding GORA-154 to branch GORA_94.

git-svn-id: https://svn.apache.org/repos/asf/gora/branches/GORA_94@1576727 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'GORA_94' of https://github.com/apache/gora into GORA_94