[ros-diffs] [cgutman] 56113: [HIVESYS] - Merge back many old changes from i386 to AMD64