Merge changes I836d1abf,I5f2c2bd7

* changes:
  Rename CustomizedMetaEntity to CustomizedMetadataEntity
  Fix NPE when get metadata without set any