You know what I hate?

I hate it when I wait an hour for vmbuilder to finish a clean build,
and then it errors out at the last minute because it can't unmount the
new volume because for some reason there's a puppet agent running
in the chroot that's holding a million files open for no reason.

This patch might make that happen less.

Change-Id: I5df02b755b2e0e0d42c247906a01a2f11fb23829
Merge "You know what I hate?" into production