Merge remote-tracking branch 'origin/master' into 3899-crunch-use-job-state

diff --cc services/api/app/models/job.rb
index 1bf17cc83e73ad5729d89ca504d26f00c0cf391e,7da6852ee0143940866db0961641caf0015a202b..a09ddb2aad32c338df9cae499113bdfe60a6ea19
--- 1/services/api/app/models/job.rb
--- 2/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@@ -63,8 -65,14 +65,12 @@@ class Job < ArvadosMode
                        running: false)
    end
  
+   def node_uuids
+     nodes.map(&:uuid)
+   end
+ 
    def self.queue
 -    self.where('started_at is ? and is_locked_by_uuid is ? and cancelled_at is ? and success is ?',
 -               nil, nil, nil, nil).
 -      order('priority desc, created_at')
 +    self.where('state = ?', Queued).order('priority desc, created_at')
    end
  
    def queue_position

diff --cc services/api/script/crunch-dispatch.rb
Simple merge