master-qa-4480

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