Merge pull request #4335 from mboersma/more-go-1.5-hacks

fix(deisctl): avoid stdout issues in tests

Author: mboersma

deisctl/Makefile

@@ -41,4 +41,5 @@ test-style:
 	$(GOLINT) ./...
 
 test-unit:
-	$(GOTEST) ./...
+# TODO: remove GOMAXPROCS=1 when concurrent stdout issues are fixed
+	GOMAXPROCS=1 $(GOTEST) ./...