http://issues.liferay.com/browse/LRDOCS-449 Backport from 6.2.x to 6.1.x

http://issues.liferay.com/browse/LRDOCS-449 Backport from 6.2.x to 6.1.x