Cleaned up instance sizes and fixed heap options for elastic search
Merge branch 'key-row-sharding' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into key-row-sharding