master-qa-5081

http://issues.liferay.com/browse/LIFERAYQA-5081