Fix for ticket https://svn.boost.org/trac/boost/ticket/9416
Don't accidentally replace the wrong symbols.
Fix for https://svn.boost.org/trac/boost/ticket/10308.
Change Boost.Build paths to match new directory layout.