(Airvata-1197) Small change to make more command-line friendly