Changes for JIRA issues GEOMESA-7 and GEOMESA-8