https://issues.liferay.com/browse/LRDOCS-819

https://issues.liferay.com/browse/LRDOCS-819

Backport to 6.1.x