[Fixed] weapon swapping bypassing per-kill xp limits - part of mantis
3260
[Fixed] player level calculation for jedi

Change-Id: Ia8203dd8d15df8e24c7a0347db620faeb3c85bc7
Merge "[Fixed] weapon swapping bypassing per-kill xp limits - part of mantis 3260 [Fixed] player level calculation for jedi" into unstable