JBDS-2624 merge changes to JBDS agg site category.xml file into this one; clean up formatting and mark usage feature as uncategorized in JBDS version