master-qa-4221

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