ensure tool is browser+os.whatever

and not browser+os+os.whatever

this should allow us to satisfactorily create bootstrap tarballs for
multiple packages