[20180603210641] Bug Fixes

  • #2714 avoid modification of env passed in to manifest loader [@ddollar]