bottle: use --root-url instead of --root_url
test-bot: more support for bottling taps.