Ensure that if we need to create a segments container it uses the same storage policy as the root container. Fixes #8858