master-qa-8069

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