Merge "mtptest: Add option to specify storage path at the command line."