Added System/getProperties lookup when search for environment variable.