CMS-2967 Add orderby for contentType aggregation

Added term and doc-count ordering