TDI-31257:Got NPE when editing a new added column during retrieving MDM
Entity in Metadata.
Merge branch 'maintenance/5.6'