CLOUDIFY-1659 added reset of the upload cleanup timeout in both upload tests.