Merge proposals dependent on lp:~ahasenack/glance-simplestreams-sync-charm/gs3-retry-apt-update-upstream

1. gs3-retry-apt-update-upstream
2. Dependent merge proposals