r187106 syncs the Makefiles with HEAD so that RELENG_7 has the same set of build knobs. Let me know if you see any oddities that you can trace to this commit. Sam