[FIX] MockServer: $expand for navigation with multiplicity 1

Change-Id: I3ba1f47b37530cf2377a5e0fc29a643deaa8226d
Merge "[FIX] MockServer: $expand for navigation with multiplicity 1"