Fix tasks in order of execution

 * Does effect on client and dashboard

Fixes-bug: #1318427

Change-Id: Ia2e1f4a3ddde53a008757ecbafc3a0608ddf802a
Merge "Fix tasks in order of execution"