Fix project task numbering rules (entity bug columns)
Merge pull request #1428 from FHenry/3.5_backported

Fix project task numbering rules (entity bug columns)