merge from master for file etc/rc.conf