Merge "upgrades: deploy mod_ssl when upgrading apache"