v17.05.26May 26th, 2017

Add per-task control over job queue concurrency and retry attempts + 1 more change