master-qa-5056

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