[DS-1230] Replace system properties with proper commandline options