Add YAML inheritance mapping support for uploadable entities
Merge branch 'uploadable_yaml_inheritance'

* uploadable_yaml_inheritance:
  Add YAML inheritance mapping support for uploadable entities