Bumped version to 2.062000
Merge remote-tracking branch 'origin/releng-R2-2.062000'

Using "ours" strategy
Update Changes file
Bump version to 2.063_000