[Fixed] npc changes - Diktat Quest

Change-Id: I1189f25c903ccd2f1cef79aa76db20001aa4b8ad
Merge "[Fixed] npc changes - Diktat Quest" into unstable