Bumped version to 2.054000
Update Changes for 2.054000
Merge remote-tracking branch 'origin/releng-R2-2.054000'

Used "ours" strategy