master-qa-5069

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