Cleaned up final merge bugs

git-svn-id: https://svn.apache.org/repos/asf/rave/branches/mongo@1428505 13f79535-47bb-0310-9956-ffa450edef68