Bug 810736 - use bundle when set in ENV - r=armenzg