Merge remote-tracking branch 'upstream/test_parallelism' into test_parallelism
move file with history to policy folder
Merge remote-tracking branch 'upstream/test_parallelism' into test_parallelism
remove file w/o history, replace with original file
move file with history to policy folder
Merge pull request #8 from smusuvat/test_parallelism

Test parallelism