Merge "ONAP code change for log files consolidation"