Issue #2051405 by fubhy: Fixed Metadata wrappers do not work with non-fieldable entities with bundles.