CLOUDIFY-1589 Fixed some command line options that were broken during debug code modifications.