Blocking: Use JID and sets everywhere

2 jobs for master in 5 minutes and 5 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Test
passed run-test #21553

00:02:46

36.0%
 
  Build
passed run-build #21554

00:02:18