Rollback commits for 1.6 release
QA-4351 : support for wiki in default workspace