Revert to RELENG_7_1 after consultation with re@
Feature safe: yes (this time for real) Approved by: portmgr,re