Finalizinf model + removal of double key on list

Change-Id: I4daf0160c0bbb813206153fbd0c43939c2bb18cc
Signed-off-by: Wojciech Dec <wdec@cisco.com>
Merge "Finalizinf model + removal of double key on list"