Updated Changes file
Bumped version to 2.048000
Merge branch 'releng-R2-2.048000' using "ours" strategy