Merge proposals dependent on lp://qastaging/~osomon/ubuntu-themes/scavenge-preserve-namespaces

1. scavenge-preserve-namespaces
2. Dependent merge proposals