Removing merge conflict
Load Test API configuration from userData

Jira issue: WP-933
Merge pull request #48 from smonteleone/WP-933

Load Test API configuration from userData
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/TobyEalden/webinos-pzh