EZP-20400 Remove ContentType from ContentInfo

This PR resolves issue EZP-20400