Fixes for mooncake environment
Reverted cap change that broke Zumo
Merge pull request #1184 from christav/mooncake-fix

Fixes for mooncake environment