cleanups to trunk. svn merge -r 56716:HEAD ../release/0.9.x/ to trunk --HG-- branch : trunk
(This is broader issue - we probably need to do some exclusive lock on files given to process_rest_file and such) --HG-- branch : trunk
--HG-- branch : trunk