make ROLLUP_DELAY_MILLIS configurable. Defaults to 5 mins
fix refactor typo in property name.
fix merge conflict