[FIX] ODataAnnotations: Support for complex property annotations

Change-Id: I6007cc96e0ce0626895259080226bc2e5f544306
Merge "[FIX] ODataAnnotations: Support for complex property annotations"