Merge branch 'master' into pilots
Merge remote-tracking branch 'upstream/pilot' into pilots
SP-19: Added startup scripts for both matchmakers
Merge remote-tracking branch 'kaspermarkus/SP-19' into pilot

* kaspermarkus/SP-19:
  SP-19: Added startup scripts for both matchmakers