Merge "Replace some of the deprecated wfGetLBFactory() calls"