Updated functional tests for data sets so that manualUpload is performed.
Merge remote-tracking branch 'upstream/master' into jpUploadDataTest
Merge pull request #790 from jaypoulz/jpUploadDataTest

Updated testing so that it performs a valid manualUpload test.