PSDEZONE-739: [psdcontentclassimport] Fixes after code review.