Fixing mem issue on master

[Prasanna Santhanam]

Hi Kelven,

Could you apply the fix from 4.1 for solving the memory issue on master. With 
that I think I can enable devcloud-ci tests for master so we get some stability 
on master.

Thanks
--
Prasanna.,