Adapt to homebrew's move of the tap directory

WORK IN PROGRESS, still fails 6 tests.  References #4035, #4029, #4026

I can't work on this further til tomorrow.  If anyone wants to address the test failures that would be most welcome.