Merge "hnvram: Added option to choose target file + tests"