clean up AggressiveDefaultDict
simplify data provider
Merge pull request #4132 from dimagi/opm-es

Update MockDataProvider with availability changes
Check for specific service availability
make the service availability dependence in tests more explicit
remove unused assignment
make service availability checks actually test the service key