Merge "addvnf support emsUuid"