[Bug 3601804]: platformCPUID segmentation fault on Darwin
[Bug 3601804]: platformCPUID segmentation fault on Darwin
[Bug 3601804]: platformCPUID segmentation fault on Darwin
merge trunk