Fix #919 - file locking exception sometimes seen when testing upload pac...

...kage with local file system.