Fixes issues with mounting subdirectories of /mnt in container. Upstream-commit: e70030a0c347b2fe8a8ea7b92fab3dde6b928f3b Component: engine