Fix for multiple HTTP_ROOT values

Change-Id: I79c8082815050b0935d8ecd4483f0f799000ff7f
Merge "Fix for multiple HTTP_ROOT values"