[CDE-353]: made server and client side system resource handling consistent
Merge pull request #161 from davidmsantos90/master

[CDE-353]: made server and client side system resource handling consistent