Handle more invalid characters in SPD model field if encountered
Merge branch '2.8' of ssh://git.code.sf.net/p/xcat/xcat-core into 2.8