Merge "ONAP log files consolidation"