Made linesPerFile configurable
Made configurator more sensible
Merge branch 'STREAMS-163'
Auto-merge | Integrating changes from apache/master