master-qa-5171

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