minor fix
Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core
Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core
add check before sending mail to avoid mail warning
add time delay
add waiting time