Remove use of d2to1

Update with the global OpenStack requirements in the process.

Change-Id: I18ae9cc78e1af8842b74cedac3ba262d733e4289