Bug 974923: Fix inaccurate Cart-Data env var references