WORDS-352 - create tests for HtmlToStringConverter.java class, some refactoring
Merge remote-tracking branch 'origin/develop' into develop