master-qa-5222

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