Restore "Add support for building bjam with pgi and pathscale toolsets." changes since the previous merge nuked them.