[Component] Various fixes for components-2 branch

Related to https://github.com/Sylius/Sylius/pull/1236

I can squash the commits if you want