master-qa-4201

http://issues.liferay.com/browse/LIFERQAY-4201