cleanup things according to cr
Merge branch 'offheap-incremental-index' of github.com:metamx/druid into offheap-incremental-index