http://issues.liferay.com/browse/LRDOCS-333

http://issues.liferay.com/browse/LRDOCS-333

Backporting from 6.2.x to 6.1.x