SVN r337340 breaks installworld and mergemaster

make installworld results in ..

(cd /usr/src/etc; make MK_MAKE_CHECK_USE_SANDBOX=yes etc-examples)
cd /usr/src/etc; install  -o root -g wheel -m 444  crontab  devd.conf
devfs.conf  ddb.conf  dhclient.conf  disktab  fbtab  gettytab  group
hosts  hosts.allow  hosts.equiv  libalias.conf  libmap.conf
login.access  login.conf  mac.conf  motd  netconfig  networks
newsyslog.conf  nsswitch.conf  phones  profile  protocols
rc.bsdextended  rc.firewall  remote  rpc  services  sysctl.conf
syslog.conf  termcap.small etc.amd64/ttys amd.map auto_master ftpusers
inetd.conf /usr/src/usr.bin/locate/locate/locate.rc
/usr/src/usr.bin/mail/misc/mail.rc ntp.conf pf.os rc.sendmail csh.cshrc
csh.login csh.logout regdomain.xml  nsmb.conf opieaccess
/usr/share/examples/etc

install: auto_master: No such file or directory
*** Error code 71

Stop.
make[6]: stopped in /usr/src/etc
*** Error code 1

Stop.

mergemaster complains of ..

imb_at_vm01:/home/imb> sudo mergemaster -FUi

*** Creating the temporary root environment in /var/tmp/temproot
 *** /var/tmp/temproot ready for use
 *** Creating and populating directory structure in /var/tmp/temproot

install: auto_master: No such file or directory

  *** FATAL ERROR: Cannot 'cd' to /usr/src and install files to
      the temproot environment

	imb