Merge pull request #93 from mbacovsky/4531_nil_in_csv

Fixes #4531 - subnet info in csv mode errors out
Fixes #3870 - add a directory for module's configs