master-qa-4002

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