In https://review.openstack.org/588962 the implementation
of the apt key store copy into the container was changed
for bionic, but left alone for xenial. This patch makes
the approach uniform across both distributions.
Change-Id: I79f49fd02be3bbee5f22cdde000b19578167e3ca