master-qa-8002

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