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

@pamval please review