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

http://issues.liferay.com/browse/LRDOCS-467

LRDOCS-467-6.1.x Backporting LRDOCS-467 update from master to 6.1.x