[FIX] MockServer: decoding of entity keys

Change-Id: I1e9bf6e29ab36417e55190ec6eec88fe9d54f44a
Merge "[FIX] MockServer: decoding of entity keys"