gconf

Merge proposals dependent on lp://qastaging/~mterry/gconf/fix-xml-system-383461

  1. fix-xml-system-383461
  2. Dependent merge proposals

lp://qastaging/~mterry/gconf/fix-xml-system-383461 has no merge proposals.