Refactor and clean-up Druid data ingestion Part 2

Build v9 indexes directly without having to convert from v8 to v9