Use environ tag

This is a follow up branch to #553 (New EnvUser). Get the environ UUID
from the state environ tag.
Merge pull request #632 from waigani/use-env-tag

Use environ tag

This is a follow up branch to #553 (New EnvUser). Get the environ UUID
from the state environ tag.