Add DataTypes extension

- this allows things to work whether we are on a deployment branch,
which has DataTypes within DataValues or in master / future deployment
branch which will have DataTypes all in the new extension.

- tested with merge message list and it does the right thing in both
  cases.

Change-Id: I74f68d20d9e98f73e2dfda56d4ae21c59853713f