am ca2a6374: Merge "Environment should only warn when asked." into jb-mr2-dev

* commit 'ca2a6374aadb95ca3f151d4bc2fdd3127f04e5e7':
  Environment should only warn when asked.