Bug 869407 - bustage fix for OSX, keep targetPlatform for merging