Fixed with current flags. With Application catalog intergration we will
be able to provide a better fix. AIRAVATA-1449