bimapper: fix a bug and add some more test coverage#18387

rboyer merged 1 commit intomainhashicorp/consul:mainfrom

rboyer/bimapper-patchhashicorp/consul:rboyer/bimapper-patchCopy head branch name to clipboard