Only count categories if count is turned on
Adding category count to changelog.md
Removing category count for top level categories
Merge pull request #2086 from david-wm/v1.5.6.x

Fixed category count to be called only when count is turned on