desktopcouch

Merge proposals dependent on lp://qastaging/~vds/desktopcouch/refactor_class_factory

  1. refactor_class_factory
  2. Dependent merge proposals

lp://qastaging/~vds/desktopcouch/refactor_class_factory has no merge proposals.