CLOUDIFY-1589 Added missing groovy file updates
CLOUDIFY-1589 Removed unnecessary command line options from groovysh