master-qa-5224

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