#2338 improved contentlet dependency management