Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181022-2.3.0

Conflicts:
	pkg/httperrors/httperrors.go

pkg/cloudcommon/db/taskman/handler.go

@@ -8,7 +8,7 @@ import (
 	"yunion.io/x/onecloud/pkg/cloudcommon/db"
 )
 
-var taskWorkMan *appsrv.WorkerManager
+var taskWorkMan *appsrv.SWorkerManager
 
 func init() {
 	taskWorkMan = appsrv.NewWorkerManager("TaskWorkerManager", 4, 100)
@@ -22,5 +22,5 @@ func AddTaskHandler(prefix string, app *appsrv.Application) {
 func runTask(taskId string, data jsonutils.JSONObject) {
 	taskWorkMan.Run(func() {
 		TaskManager.execTask(taskId, data)
-	}, nil)
+	}, nil, nil)
 }

pkg/cloudcommon/db/taskman/localtaskworker.go

@@ -9,7 +9,7 @@ import (
 	"yunion.io/x/onecloud/pkg/appsrv"
 )
 
-var localTaskWorkerMan *appsrv.WorkerManager
+var localTaskWorkerMan *appsrv.SWorkerManager
 
 func init() {
 	localTaskWorkerMan = appsrv.NewWorkerManager("LocalTaskWorkerManager", 4, 10)
@@ -42,5 +42,5 @@ func LocalTaskRun(task ITask, proc func() (jsonutils.JSONObject, error)) {
 			task.ScheduleRun(data)
 		}
 
-	}, nil)
+	}, nil, nil)
 }