Merge "Unbreak Boost.Build tests"
See https://svn.boost.org/trac/boost/changeset/72883
Authorized by Beman.