Honor delivery mode value from command line

This change fixes a bug where delivery mode value was hardcoded to "persistent" even when --persistent flag wasn't specified on the command line options.