[boost] Unmerged changes in MPL