fixes required to avoid breaking Cray support#3008
Merged
bartoldeman merged 2 commits intoeasybuilders:developfrom Sep 16, 2019
Merged
fixes required to avoid breaking Cray support#3008bartoldeman merged 2 commits intoeasybuilders:developfrom
bartoldeman merged 2 commits intoeasybuilders:developfrom