master-qa-5037

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