Merge "fix NPE on serviceInventory -service without VNF"