Revert "Revert "Merge pull request #138 from mulesoft/bugs/sort-shelf-elements-in-alphabetical-order-62347166""

This reverts commit 6bd7cab1ec3e5eb7309e85aecd688876d280b4e4.