Order comments.

This is old PR #958 being rebased and adjusted to latest changes in Sylius.