am 3aeec65f: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '3aeec65f6398183ea8dd086f4d33cbc32cbce8c7':
  Update environment variable for multi-user.