BroadleafCommerce/BroadleafCommerce#738 - Fix activity ordering