bugfixes to last minute changes for xwiki upload tool