Merge "[ONAP] change comment style"