Implementing the requested improvements

Addressing comments done in https://gerrit.onap.org/r/#/c/82315/ and in the subsequent CDS weekly call.

(Resubmitting patch done on previous repo, https://gerrit.onap.org/r/#/c/83063/)

Change-Id: I6f948dedf972c33ea6fe0f65884f23cd48adcfba
Issue-ID: CCSDK-926
Signed-off-by: ottero <rodrigo.ottero@est.tech>
13 files changed