Loadbalancer fixes and whitelist changes

Change-Id: I73aa4d3b28dce8c542becbf38be75dfd2bb1e13a
Merge "Loadbalancer fixes and whitelist changes"