Update Changes file
Bump version to 2.070000
Merge remote-tracking branch 'origin/releng-R2-2.070000'

Used "ours" strategy
Update Changes file
Bump version to 2.071_000: t+