Resolved conflict after cherry-pick
Resolved conflict after cherry-pick
Cleaned up code for HTTP Basic engine. IN-6