ERT-549 - Added support for optional arguments and non-existing paths.
Merge remote-tracking branch 'upstream/master' into ERT-549
Merge pull request #431 from jepebe/ERT-549

Ert 549 Optional arguments and paths that maybe exists.