LRDOCS-514 Backport fix to 6.1.x
Merge pull request #572 from jrao/LRDOCS-514-6.1.x

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