Puts twisted dependencies from I4873abce509e391cbe3104883965c91dd0b592d1 where they belong

Requires Ie112d030e582123151ba69b2beb6936c836ecf11 from DataValues repository.

Change-Id: I953343ca1b8efdd29a9666e794d832c943d3a756
Merge "Puts twisted dependencies from I4873abce509e391cbe3104883965c91dd0b592d1 where they belong"