Merge "Add heka.toml"