Update Changes file
Bump version to 2.046000 for indexed release
Merge remote-tracking branch 'origin/releng-R2-2.046000' into trunk-r2

Used  "ours" strategy.
Updated Changes file; bumped version to 2.047_000