make subvars could handle the var in #INCLUDE
modify xcatreg code for autotest ubuntu  branch