
When a system scoped openrc file is available, it is currently necessary to clear your environment between using the two differently scoped files. These changes tidy up the environment so the files can be used interchangeably. Change-Id: I2d45dd3d58bfc1ad1cb365d2cd4b866d5d25f9e6