Bug #2353 #2354: disk_type is not removed from template, is processed in update, and is case insensitive
(cherry picked from commit ff384e6b0193eb79b953aa2510a4f468e8fd116e)