Update MockDataProvider with availability changes
clean up AggressiveDefaultDict
simplify data provider
Merge pull request #4132 from dimagi/opm-es

Update MockDataProvider with availability changes