fix for RTE tests and for CrossWiki tests
Merge remote-tracking branch 'origin/master' into CON-1494-fix-preview-test-for-pt-page