Committing GORA-206. Step towards putting an end to GORA-174

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