Reintroduce change to copy {make,src}.conf to the chroot

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
Merge branch 'master' into atf-tools-regression-convert
Merge branch 'atf-tools-regression-convert' of github.com:yaneurabeya/freebsd into atf-tools-regression-convert