Merge proposals dependent on lp://qastaging/~dpm/ubuntu-weather-app/conditional-weather-followup

1. conditional-weather-followup
2. Dependent merge proposals