Merge branch 'harshitha/adaptive_lb' of charmgit:charm into harshitha/adaptive_lb