Use settings in OWD_TEST_TOOLKIT_LOCATION for all scripts.
Correction to marketplace change.
Merge pull request #27 from roydude/v1-train

V1 train