order item count fix and tr class filters in 2.1.12

Contains fixes and filters from #5662 and #5663 into 2.1.12. Since the file structure in the master branch is different, this should help speed things up quite a bit.

Filters are needed to resolve tickets related to bundled/composited admin item count and bundled/composited line item appearance.