Merge branch 'stable-3.13'

* stable-3.13:
  Fix user extract pattern for maxStartForTaskForUserForQueue

Change-Id: I417af0be72ffec0a5c6f913c67e7afcb1fd2ab49