fix defect #4299 Node provision failed because kickstart file have unreasonable conf which caused by switch discovery emthod
Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core