Fixed screwed commit "Added optional path parameter to specify custom location"
Fixed screwed commit "Added optional path parameter to specify custom location"

This reverts commit c6d07a617f01b7466b837e28d56a962ae9e357ab.

Conflicts:
	lib/cuckoo/common/utils.py

cuckoobox/cuckoo,cuckoobox/cuckoo,cuckoobox/cuckoo,cuckoobox/cuckoo,cuckoobox/cuckoo