RIFT 16525 Make file-types consistent in get-pacakge-schema and package-file-add...