[FIX] ODataAnnotations: Fix property collection from metadata

Change-Id: I8c905f8d2a7f3b4fc1fe08a3235baa802b98391f
Merge "[FIX] ODataAnnotations: Fix property collection from metadata"