Tentative fix for bug 1.a
-------------------------
1)
    1.a - ISSUE: missing Entity and Subentity for SW_version and SW_patches KPIs.
-------------------------