[ecloud] fixed object returns in mock
Merge pull request #1547 from ehowe/master

[ecloud] Cleaning up bad code