Adapt to homebrew's move of the tap directory

WORK IN PROGRESS, still fails 6 tests.  References #4035, #4029, #4026