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
Merge pull request #4133 from dimagi/opm-es2

Check for specific service availability