Merge proposals dependent on lp://qastaging/~ken-vandine/weather-indicator/no_desktopcouch_packaging

1. no_desktopcouch_packaging
2. Dependent merge proposals