[boost] [1.35.0][conversion] Failure to merge trunk changes to release branch