Bug #2353 #2354: disk_type is not removed from template, is processed in update, and is case insensitive