Issue #731724 followup by berdir, chx: HEAD BROKEN due to Convert comment settings into a field to make them work with CMI and non-node entities