to reduce the number of compiler warnings. update some template and cnf files to use _U_ as well svn path=/trunk/; revision=21088
svn path=/trunk/; revision=18921
svn path=/trunk/; revision=18855