Fix rollup failure for delayed metrics bug, by making changes in rollup state management
Add tests for the new rollup state management
Merge pull request #374 from chinmay-gupte/chinmay/delayed_metrics_bugfix

RFR: Fix rollup failure for delayed metrics bug