[Fixed] aggressiveness of some mobs - mantis 5371, 5372

Change-Id: I3657286001b7ff96246778b7af3a1b8d0c46a078
Merge "[Fixed] aggressiveness of some mobs - mantis 5371, 5372" into unstable