Merge pull request #802 from jmaas/release26

Fix infinite loop in get_file_device_path() in chroot environment #784.