Merge proposals dependent on lp://qastaging/~didrocks/ubuntu-webcatalog/oneconf

lp://qastaging/~didrocks/ubuntu-webcatalog/oneconf has no merge proposals.