master-qa-5594

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