Update cirros.tar.gz handling to be more agnostic of running within the image Upstream-commit: eefe6c28318d8917c244906c9ae8e554e74decb9 Component: engine