Merge branch 'fai-make-nfsroot' into fai-merged
Merge branch 'fai-do-scripts' into fai-merged

Conflicts:
	conf/fai.conf.defaults
Merge branch 'error-handling' into fai-merged

Conflicts:
	conf/fai.conf.defaults
	lib/subroutines
	man/fai.conf.5