LRDOCS-388 Backport from 6.2.x to 6.1.x
LRDOCS-497 Backport from 6.2.x to 6.1.x
Merge pull request #466 from jrao/LRDOCS-388-6.1.x

http://issues.liferay.com/browse/LRDOCS-388
Merge pull request #470 from jrao/LRDOCS-497-6.1.x

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