Fix Bug #1193763 - Save to device template generates exception for custom column names