master-qa-4904

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