SCE-592: Integration test fails in TestParallel (#306)
SCE-592: Integration test fails in TestParallel (#306)

* SCE-592: Fix for TestParallel

* Apply review from @skonefal

* Rearrange defers

intelsdi-x/swan,intelsdi-x/swan,intelsdi-x/swan