Merge "Add support for dedicated executors for package tasks." into tm-dev