bottle: fix typo'd option name
bottles: fix options hashes

Defaults can't be specified in the parameter list, as they will be
overwritten by whatever is passed in. Instead the defaults must be
merged with the argument in the method body.
versions: fix bottle filename usage
git: install remote helpers for hg and bzr

Closes #25032.