am ec0f5e5f: Merge "Fix issue #7257947: Need to fix heap limits on Mako" into jb-mr1-dev

* commit 'ec0f5e5f0c433666698fa55c2e38ccdc9cf0df44':
  Fix issue #7257947: Need to fix heap limits on Mako