Merge "Fix variable set for e2e service" into casablanca