Update gold files to match the linux results
    
@bug W-2164666@
@rev dval@
Merging origin/rsalvador/master-pending-goldfileupd into master