Merge branch 'master' into 3605-improved-dashboard

Conflicts:
	services/api/app/controllers/arvados/v1/jobs_controller.rb

diff --cc services/api/app/controllers/arvados/v1/jobs_controller.rb
index 5a571d4a8b6665b98ee6a9d76d9055c99e1c5e34,7b3b6586f68a1e0bb86383cef6f4c7e5e006a61e..d8ceb850f8a7c0dc7e1290b4b39f66f48961671b
--- 1/services/api/app/controllers/arvados/v1/jobs_controller.rb
--- 2/services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/services/api/app/controllers/arvados/v1/jobs_controller.rb
@@@ -163,7 -163,9 +163,10 @@@ class Arvados::V1::JobsController < App
    end
  
    def queue_size
-           render :json => {:queue_size => Job.queue.size}
+     # Users may not be allowed to see all the jobs in the queue, so provide a
 -    # method to get the actual queue length.
++    # method to get just the queue size in order to get a gist of how busy the
++    # cluster is.
+     render :json => {:queue_size => Job.queue.size}
    end
  
    def self._create_requires_parameters