BZ-11757 - huge refactoring, removed redundant neFileDownload directive.
BZ-11929: Fix the placeholder characters in the resulting image
Merge branch 'origin/master'