https://issues.liferay.com/browse/LRDOCS-779

https://issues.liferay.com/browse/LRDOCS-779

Reverted JOnAS commits