[FORWARD PORT] LPS-51305 pass resouceClassNameId when deleting