Don't hardcode chroot executable path
Remove unused modules
Merge pull request #2952 from mmoya/bug-fixes

Don't hardcode chroot path