[AMOS commit] MDL-58746 core: Simplify environment check Committed into Git: 2017-05-03 00:32 UTC