Updates to DFC CSIT test

Adaptation of Functional tests due to updated dfc simulators
Adaptation of Management tests due to changes in DFC app
Removed test for FTPS due to issue with ftps sim cert

Issue-ID: DCAEGEN2-1434

Change-Id: Ic92ac4901586cb55164177a8640ba23b60c02f0d
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh
index e494028..e2a0c12 100644
--- a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh
+++ b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh
@@ -4,10 +4,10 @@
 docker kill "$(docker ps -q -a)"
 docker rm "$(docker ps -q -a)"
 
-# Clone Simulators for DFC from integration repo. 
+# Clone Simulators for DFC from integration repo.
 mkdir -p $WORKSPACE/archives/dfc
 cd $WORKSPACE/archives/dfc
-git clone --depth 1 https://gerrit.onap.org/r/integration -b master   #How to make this version controlled for Dublin, El Alto etc etc
+git clone --depth 1 https://gerrit.onap.org/r/integration -b master
 
 #Location of all individual simulators for DFC
 SIM_ROOT=$WORKSPACE/archives/dfc/integration/test/mocks/datafilecollector-testharness