TEST: revert server to 18 players limit

Signed-off-by: Ivailo Spasov <ivailosp@abv.bg>
Merge branch 'master' into test
Merge branch 'master' into test
Revert "TEST: revert server to 18 players limit"

This reverts commit 5ca6c4d7cb48e6161a337efc29be975111978229.
Code clean up

Signed-off-by: Ivaylo Spasov <ispasov@ti.com>