Merge "Fixing CSIT ETSI NFVO Failures on Master + Small Refactoring"