Merge "Fix schema definition admin_flavor_create"