2.5.11: Merge pull request #530 from HSF/dev
(1) fix content_dep_id when there are internal dependencies inside a task (normally jobs in one task only depends on jobs in previous tasks)
(2) fix parent_internal_id when there are internal dependencies inside a task, which caused parent_internal_id includes the task itself