CLOUDIFY-1786 clean up
CLOUDIFY-1906 Fixed script directory