use an ephemeral port for the fake fileserver

turns out 9999 is a popular number

Signed-off-by: Ruth Byers <rbyers@pivotallabs.com>
Revert "use an ephemeral port for the fake fileserver"

didn't actually help and just made things more complex

This reverts commit c4bb7d1dfd585c29cfcb7fd0a77ca47650f9f9a0.
use port 10197 for dea file server

9999 is too likely to collide

Signed-off-by: Ruth Byers <rbyers@pivotallabs.com>
Better logging for upload completion
Auto-merge remote-tracking branch 'upstream/master'