am 436b6ee3: Merge "Catch a few extra users of UserEnvironment." into klp-dev

* commit '436b6ee3500888a1611d2030b994263b5efa44bc':
  Catch a few extra users of UserEnvironment.