CMS-969 Split logic for space creation in SpaceDao and ContentDao
Reverted change.