Fix task manager migration

@tien-thinh.nguyen

when you migrated the task-manager to common-src repo, you used an incomplete version.

I've resync'ed the common-src to develop and adding one commit.

Let see if it builds nicely.