Patch Set 3:

AFAICT this is same as Patch Set 2 with the addition of the FileUtils change? I'm new to Gerrit, I can't see how to pull my review over to Patch Set 3, but the comments would be unchanged in any case :-)