master-qa-5223

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