Make log ordering more consistent for tests
Merge pull request #2405 from chuckharmston/1052858

Include total app count in homepage serializations of collections (needed for bug 1052858).
Fix tests broken in e708c07