master-qa-5035

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