- Merge pull request #9349 from amaltaro/fix-9339
  - fix unit tests and move it to the right place
  - Add services into configuration to separate MSTransferor/MSMonitor
  - Merge pull request #9351 from amaltaro/fix-9350
  - Support multiple applications under the same service/statedir