Merge "rdbms: fix typo and clean up some cruft in MWLBFactory"