Fix cmdline parsing to support more situations (bnc#889241)
Changelog and version number updates
Merge pull request #275 from ancorgs/fix_cmdline_parsing

Fix cmdline parsing to support more situations (bnc#889241)