[todo] Update todo file (backports)
Discussed with Pedro, keep « contrail » everywhere is more sustainable
Merge pull request #29 from sbadia/revert-rename

Discussed with Pedro, keep « contrail » everywhere is more sustainable
Merge pull request #42 from sbadia/update-todo

[todo] Update todo file (backports)