refs #7636 improve case type handling in upgrade script