CLOUDIFY-1589 Canceled some command line modifications to make debugging commands easier