[Fixed] weapons to be swappable when inventory is full - mantis 4793

Change-Id: I0c1fa4ad72e33f30c45d71f3ca3946db6402d9a7
Merge "[Fixed] weapons to be swappable when inventory is full - mantis 4793" into unstable