Merge feature files related to upload file.
modification of the Merging feature files related to Upload File in the automation suite.
[#1817] Resolved the conflicts from the pull request