+ [OE-4143] fix comment formatting in view
Table versioning / soft deletion changes.
Merge branch 'release/1.6' into develop
+ [OE-4143] fix printing of comments
Merge branch 'release/1.6' into develop

Conflicts:
	views/default/print.php
Merge branch 'develop' into jira/3987