Update used version of DataValues

Change-Id: I6659e8fa9718566374f3bcb59f315e0fb1b3f8c2
Update min version of DataModel

It also should have been at 2.2 before already, since we are using things
from that release.

Change-Id: I0c5a6ee013e1ad0f7e12c3882b849c3fff986bd9
Merge "Update used version of DataValues"