Merge "Start to commit CIG ONF config files"