JBTIS-23 - add infrastruture/support for multiple p2 categories and discovery