Move from standalone container to separate web and data containers

[merefield (Robert)]

I’m not a fan. This feels like one step closer to dropping support for two-containers overall and that would be a huge shame.