Test service status separately

Sometimes the 2 services return in different orders so we'll test for
each one separately
Merge pull request #7053 from UtahDave/fix_supervisord_test

Test service status separately