Merge proposals dependent on lp://qastaging/~chad.smith/update-notifier/updates-available-include-esm-packages-from-ubuntu-advantage-cache

1. updates-available-include-esm-packages-from-ubuntu-advantage-cache
2. Dependent merge proposals