master-qa-4211

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