Remove envinject from groups

Instead source the properties into the environment.

Change-Id: Icac1bd17a291887bb86317fd04819889b9ba1e73
Merge "Remove envinject from groups"