#886 - Added sortProperty to @AdminPresentationAdornedTargetCollection of allParentCategoryXrefs of CategoryImpl so that display order gets populated (instead of being null which caused an error when attempting to reorder)
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x