Fix metadata type names for Report and Dashboard and remove duplicate
call to deployUnpackagedPre