[boost] Merge intel-linux build fix?