[AAI] Merging the latest v24 schema to ONAP