Update changes file for 2.060000
Bumped version to 2.060000
Merge remote-tracking branch 'origin/releng-R2-2.060000'

Used "ours" strategy
Update Changes file
Bumped version to 2.061_000