These changes are needed to make the lxc tiny images tests work properly.
https://phabricator.apertis.org/T7900