Closes #3583684
The aim here is to achieve the equivalent functionality for component trees stored in content entities as !898 does for component trees stored in config entities.