BZ-11757 - huge refactoring, removed redundant neFileDownload directive.
Merge branch 'origin/master'